SET PATH=E:\builds\release-1911\bin;E:\builds\release-1911\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;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;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\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\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:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;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 if exist E:\builds\release-1911\bin\curl\curl.exe E:\builds\release-1911\bin\curl\curl.exe -o E:\builds\release-1911\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver git reset --hard HEAD HEAD is now at d91fec44 Fixes for using none ascii characters in Sql Server connection strings, queries and results (#6150) git pull origin Already up to date. git reset --hard HEAD HEAD is now at d91fec44 Fixes for using none ascii characters in Sql Server connection strings, queries and results (#6150) git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\ms_revision.txt type E:\builds\release-1911\doc\ms_revision.txt d91fec44118f7c421355e8632d20bd96c7152887 cd E:\builds cd ..\sdk\vc15\gdal\gdal git reset --hard HEAD HEAD is now at 7f900bc2a1 Shape: Improve msan behavior of dbfopen API calls. (#2988) git pull origin Updating 7f900bc2a1..84e0e64d6a Fast-forward autotest/ogr/ogr_eeda.py | 2 +- autotest/ogr/ogr_esrijson.py | 4 +- autotest/ogr/ogr_plscenes.py | 4 +- autotest/ogr/ogr_sql_rfc28.py | 23 ++ autotest/ogr/ogr_wfs.py | 2 +- gdal/doc/source/drivers/vector/gml.rst | 26 +- gdal/frmts/eeda/eedadataset.cpp | 2 +- gdal/frmts/ogcapi/gdalogcapidataset.cpp | 12 +- gdal/frmts/openjpeg/openjpegdataset.cpp | 5 + gdal/frmts/tiledb/tiledbdataset.cpp | 6 +- gdal/ogr/ogr_swq.h | 2 +- .../ogrsf_frmts/aeronavfaa/ograeronavfaadriver.cpp | 2 +- .../ogrsf_frmts/amigocloud/ogramigoclouddriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/arcgen/ograrcgendriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/avc/ogravcbindriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/avc/ogravce00driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/bna/ogrbnadriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/cad/ogrcaddriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/carto/ogrcartodriver.cpp | 3 +- .../ogr/ogrsf_frmts/cloudant/ogrcloudantdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/couchdb/ogrcouchdbdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/csw/ogrcswdataset.cpp | 2 +- gdal/ogr/ogrsf_frmts/db2/ogrdb2driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/dwg/ogrdgnv8driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/dwg/ogrdwgdriver.cpp | 3 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxfdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/edigeo/ogredigeodriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/geojson/ogresrijsondriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp | 6 +- .../ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/geojson/ogrtopojsondriver.cpp | 2 +- .../ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/georss/ogrgeorssdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp | 4 +- gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 2 +- .../ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gpx/ogrgpxdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/grass/ogrgrassdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gtm/ogrgtmdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/htf/ogrhtfdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ili/ogrili1driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ili/ogrili2driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/jml/ogrjmldataset.cpp | 2 +- gdal/ogr/ogrsf_frmts/kml/ogrkmldriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp | 3 +- gdal/ogr/ogrsf_frmts/mdb/ogrmdbdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/mitab/mitab_ogr_driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/mongodb/ogrmongodbdriver.cpp | 2 +- .../ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp | 2 +- .../mssqlspatial/ogrmssqlspatialdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 2 +- gdal/ogr/ogrsf_frmts/mysql/ogrmysqldriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/nas/ogrnasdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ngw/ogrngwdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ngw/ogrngwlayer.cpp | 3 + gdal/ogr/ogrsf_frmts/ntf/ogrntfdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/oci/ogrocidriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ods/ogrodsdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/openair/ogropenairdriver.cpp | 2 +- .../openfilegdb/ogropenfilegdbdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/osm/ogrosmdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/pds/ogrpdsdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/pg/ogrpgdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp | 2 +- .../plscenes/ogrplscenesdatav1layer.cpp | 2 +- .../ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/s57/ogrs57driver.cpp | 2 +- gdal/ogr/ogrsf_frmts/sdts/ogrsdtsdriver.cpp | 2 +- .../ogr/ogrsf_frmts/segukooa/ogrsegukooadriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/segy/ogrsegydriver.cpp | 3 +- gdal/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/sosi/ogrsosidriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitedriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/sua/ogrsuadriver.cpp | 3 +- gdal/ogr/ogrsf_frmts/svg/ogrsvgdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/sxf/ogrsxfdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/tiger/ogrtigerdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp | 2 +- gdal/ogr/ogrsf_frmts/vfk/ogrvfkdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/vrt/ogrvrtdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/wasp/ogrwaspdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/xls/ogrxlsdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/xplane/ogrxplanedriver.cpp | 2 +- gdal/ogr/swq.cpp | 5 +- gdal/ogr/swq_expr_node.cpp | 10 +- gdal/ogr/swq_op_general.cpp | 16 +- gdal/ogr/swq_parser.cpp | 340 +++++++++++---------- gdal/ogr/swq_parser.y | 20 +- 100 files changed, 366 insertions(+), 293 deletions(-) git reset --hard HEAD HEAD is now at 84e0e64d6a SEGY: fix potential double free. CID 1432812 git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\gdal_revision.txt type E:\builds\release-1911\doc\gdal_revision.txt 84e0e64d6a6d2492a144e604582043eec6119af6 cd E:\builds