found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64 cd src\mapserver-vc15x64 git reset --hard HEAD HEAD is now at 67ddf3340 Merge pull request #6892 from geographika/doxygen git fetch git checkout main Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 67ddf3340..db74212ec Fast-forward mapfile.c | 15 +++- mapserv.c | 3 +- mapservutil.c | 2 +- maputil.c | 6 ++ .../api/expected/ogcapi_missing_api_signature2.txt | 2 +- msautotest/config/hello_world.map | 2 + msautotest/renderers/data/label_alias_offset.dbf | Bin 3084 -> 3216 bytes .../renderers/expected/label_priority_binding.png | Bin 0 -> 9483 bytes .../expected/label_priority_expression.png | Bin 0 -> 9476 bytes .../renderers/expected/label_priority_fixed.png | Bin 0 -> 8450 bytes msautotest/renderers/labels-priority.map | 80 +++++++++++++++++++++ 11 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 msautotest/renderers/expected/label_priority_binding.png create mode 100644 msautotest/renderers/expected/label_priority_expression.png create mode 100644 msautotest/renderers/expected/label_priority_fixed.png create mode 100644 msautotest/renderers/labels-priority.map git reset --hard HEAD HEAD is now at db74212ec Allow expressions in LABEL PRIORITY (#6884) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt type E:\buildsystem\release-1916-x64\doc\ms_revision.txt db74212ec9d16030870bc4a280771febfada8091 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64 cd src\gdal-vc15x64 git reset --hard HEAD HEAD is now at e3d2d6c108 Merge pull request #7849 from rouault/vsiadls_sas git fetch git checkout master Your branch is behind 'origin/master' by 16 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating e3d2d6c108..57740a5d1e Fast-forward .github/workflows/ubuntu_18.04/test.sh | 4 +- apps/gdalsrsinfo.cpp | 17 +- autotest/cpp/test_gdal.cpp | 51 +++++ .../compound_with_VerticalCitationGeoKey_only.tif | Bin 0 -> 1160 bytes autotest/gcore/tiff_srs.py | 64 ++++++ .../data/grib/byte_wrong_earth_shape.grib2 | Bin 0 -> 596 bytes autotest/gdrivers/grib.py | 25 +++ autotest/generate_parquet_test_file.py | 44 ++++ autotest/ogr/data/parquet/wkt_with_dict.parquet | Bin 0 -> 1732 bytes autotest/ogr/ogr_mysql.py | 31 ++- autotest/ogr/ogr_parquet.py | 25 +++ frmts/grib/degrib/degrib/metaparse.cpp | 47 +++-- frmts/grib/gribdataset.cpp | 41 +++- frmts/gtiff/gt_wkt_srs.cpp | 110 +++++++++- frmts/netcdf/netcdfdataset.cpp | 15 +- frmts/netcdf/netcdfdataset.h | 2 + frmts/netcdf/netcdfmultidim.cpp | 6 +- gcore/gdal_priv.h | 2 + gcore/gdaldataset.cpp | 183 ++++++++++++----- ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp | 27 ++- ogr/ogrsf_frmts/mysql/ogr_mysql.h | 39 +++- ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 224 ++++++++++++++++++--- ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp | 20 +- ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp | 10 +- ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp | 19 +- 25 files changed, 853 insertions(+), 153 deletions(-) create mode 100644 autotest/gcore/data/gtiff/compound_with_VerticalCitationGeoKey_only.tif create mode 100644 autotest/gdrivers/data/grib/byte_wrong_earth_shape.grib2 create mode 100644 autotest/ogr/data/parquet/wkt_with_dict.parquet git reset --hard HEAD HEAD is now at 57740a5d1e Merge pull request #7845 from rouault/CreateWKTArrayFromWKBArray_fixup git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt 57740a5d1ead1046deb9f94e3a5a5772227bfc61 cd E:\buildsystem set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja git config --global core.autocrlf false if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64 cd src\mapcache-vc15x64 git reset --hard HEAD HEAD is now at 0cb6c00 change Migration Guide to markdown (#305) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt 0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem