Changeset: 1325957f394a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1325957f394a Added Files: ChangeLog.Jul2017 NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py buildtools/ChangeLog.Jul2017 clients/ChangeLog.Jul2017 clients/mapilib/ChangeLog.Jul2017 common/stream/ChangeLog.Jul2017 gdk/ChangeLog.Jul2017 geom/ChangeLog.Jul2017 monetdb5/ChangeLog.Jul2017 sql/ChangeLog.Jul2017 sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out sql/test/BugTracker-2017/Tests/nestedoperators.Bug-6292.sql sql/test/leaks/Tests/check1.reqtests sql/test/leaks/Tests/check1.sql sql/test/leaks/Tests/check2.reqtests sql/test/leaks/Tests/check3.reqtests sql/test/leaks/Tests/check4.reqtests sql/test/leaks/Tests/check5.reqtests sql/test/leaks/Tests/drop3.reqtests sql/test/leaks/Tests/initialize.sql sql/test/leaks/Tests/initialize.stable.err sql/test/leaks/Tests/initialize.stable.out sql/test/leaks/Tests/select1.reqtests sql/test/leaks/Tests/select2.reqtests sql/test/leaks/Tests/temp1.reqtests sql/test/leaks/Tests/temp2.reqtests sql/test/leaks/Tests/temp3.reqtests testing/ChangeLog.Jul2017 tools/merovingian/ChangeLog.Jul2017 Removed Files: NT/installer32/MonetDB-ODBC-Driver.sln NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.sln NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.sln NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer32/cv64-32.sh NT/installer64/MonetDB-ODBC-Driver.sln NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.sln NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.sln NT/installer64/MonetDB5-SQL-Installer.vdproj NT/installer64/cv32-64.sh NT/installer64/fixmsi.py monetdb5/scheduler/srvpool.c monetdb5/scheduler/srvpool.h monetdb5/scheduler/srvpool.mal sql/test/leaks/Tests/check0.sql sql/test/leaks/Tests/check0.stable.err sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.sql.src Modified Files: .hgtags ChangeLog MonetDB.spec NT/Makefile NT/monetdb_config.h.in NT/rules.msc buildtools/conf/banner.bmp buildtools/doc/windowsbuild.rst clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/ChangeLog gdk/ChangeLog-Archive gdk/ChangeLog.Dec2016 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/libbat.rc geom/monetdb5/Makefile.ag libversions monetdb5/ChangeLog monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Dec2016 monetdb5/extras/mal_optimizer_template/Makefile.ag monetdb5/mal/mal_authorize.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_stack.c monetdb5/modules/kernel/Makefile.ag monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mat.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/scheduler/Makefile.ag monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/ChangeLog-Archive sql/ChangeLog.Dec2016 sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_bat2time.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_round_impl.h sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/Makefile.ag sql/backends/monet5/vaults/bam/bam_lib.c sql/backends/monet5/vaults/fits/Makefile.ag sql/backends/monet5/vaults/fits/fits.c sql/backends/monet5/vaults/netcdf/Makefile.ag sql/backends/monet5/vaults/shp/shp.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/sql_atom.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/bat/res_table.c sql/test/BugTracker-2017/Tests/All sql/test/leaks/Tests/All sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.sql.src sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.sql.src sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.sql.src sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.sql.src sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-load.sql testing/Mtest.py.in vertoo.config vertoo.data Branch: wlcr Log Message:
Merge with default diffs (truncated from 20524 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -664,3 +664,7 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release +c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_19 +07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release +c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release +54a8c9d99dc3621a02579db0c59309781caceb54 Jul2017_root diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu April 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> -- Added a new server-side protocol implementation. The new protocol is backwards compatible with the old protocol. Clients can choose whether they want to use the old or the new protocol during the initial handshake with the server. The new protocol is a binary column-based protocol that is significantly faster than the old protocol when transferring large result sets. In addition, the new protocol supports compression using Snappy or LZ4. - -* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> -- Added 5 new sys schema tables: function_languages, function_types, - key_types, index_types and privilege_codes. They are pre-loaded with - static content and contain descriptive names for the various integer - type and code values. See also sql/scripts/51_sys_schema_extension.sql diff --git a/ChangeLog b/ChangeLog.Jul2017 copy from ChangeLog copy to ChangeLog.Jul2017 --- a/ChangeLog +++ b/ChangeLog.Jul2017 @@ -1,8 +1,24 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu April 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> -- Added a new server-side protocol implementation. The new protocol is backwards compatible with the old protocol. Clients can choose whether they want to use the old or the new protocol during the initial handshake with the server. The new protocol is a binary column-based protocol that is significantly faster than the old protocol when transferring large result sets. In addition, the new protocol supports compression using Snappy or LZ4. +* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> +- Added a new server-side protocol implementation. The new protocol + is backwards compatible with the old protocol. Clients can choose + whether they want to use the old or the new protocol during the initial + handshake with the server. The new protocol is a binary column-based + protocol that is significantly faster than the old protocol when + transferring large result sets. In addition, the new protocol supports + compression using Snappy or LZ4. + +* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org> +- Moved the sphinx extension module to its own repository. + See https://dev.monetdb.org/hg/MonetDB-sphinx/. + +* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org> +- Removed GSL module: it's now a separate (extension) package. + See https://dev.monetdb.org/hg/MonetDB-gsl/. +- The PCRE library is now optional for systems that support POSIX regular + expressions. * Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com> - Added 5 new sys schema tables: function_languages, function_types, diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.26.0 +%define version 11.28.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs @@ -953,6 +953,21 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418 +- Rebuilt. +- BZ#6259: crash on select query from sqlitelogictests + +* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418 +- gdk: A potential deadlock was fixed in order index creation. +- gdk: A bug that could happen during recovery of the write-ahead log (WAL) + was fixed. See changeset 98ad79c555cc for details. + +* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418 +- monetdb5: Some memory leaks were plugged. + +* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418 +- sql: Some memory leaks were plugged. + * Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411 - Rebuilt. - BZ#6110: cast of a SQL boolean value to a string or clob or (var)char diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -9,12 +9,15 @@ TOPDIR = . srcdir = $(TOPDIR)\.. +# location of NT directory +NT = $(srcdir)\NT + prefix = $(MAKEDIR) # ensure "all" is first target all: _all -!INCLUDE "$(TOPDIR)\..\NT\rules.msc" +!INCLUDE "$(NT)\rules.msc" _all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h .monetdb $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" all @@ -22,14 +25,15 @@ all: _all install: targetdirs all $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)" "bits=$(bits)" install $(INSTALL) .monetdb "$(sysconfdir)" - $(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)" - $(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)" + $(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs" + $(PYTHON) $(NT)\mkgeomwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB5-Geom-Installer.wxs" + $(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)" "$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs" $(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag" cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&$(PYTHON) buildtools\autogen\autogen.py -monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(srcdir)\NT\monetdb_config.h.in" - $(CONFIGURE) "$(srcdir)\NT\monetdb_config.h.in" > monetdb_config.h +monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(NT)\monetdb_config.h.in" + $(CONFIGURE) "$(NT)\monetdb_config.h.in" > monetdb_config.h unistd.h: $(ECHO) #ifndef UNISTD_H > unistd.h diff --git a/NT/installer32/MonetDB-ODBC-Driver.sln b/NT/installer32/MonetDB-ODBC-Driver.sln deleted file mode 100644 --- a/NT/installer32/MonetDB-ODBC-Driver.sln +++ /dev/null @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB-ODBC-Installer", "MonetDB-ODBC-Installer.vdproj", "{33AE0CC1-169E-4168-978A-0CDDD1E6A51A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Default = Debug|Default - Release|Default = Release|Default - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.ActiveCfg = Debug - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.Build.0 = Debug - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.ActiveCfg = Release - {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.Build.0 = Release - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj deleted file mode 100644 --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ /dev/null @@ -1,1225 +0,0 @@ -"DeployProject" -{ -"VSVersion" = "3:800" -"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" -"IsWebType" = "8:FALSE" -"ProjectName" = "8:MonetDB-ODBC-Installer" -"LanguageId" = "3:1033" -"CodePage" = "3:1252" -"UILanguageId" = "3:1033" -"SccProjectName" = "8:" -"SccLocalPath" = "8:" -"SccAuxPath" = "8:" -"SccProvider" = "8:" - "Hierarchy" - { - "Entry" - { - "MsmKey" = "8:_14F4BC1A7F54458D91CFA4A0BD174604" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_17D7FB69076E415C8973295D502161C5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2E74F1B1BDE548A7922BAD968E690A3A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_2FB9A57E3DD7443F97A7C8B0DBF82DB5" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_3517E482BC7F4EFC88537C979178E768" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4F0D2367141846EFA634DA35B05CDA4D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_5CCCB992693C48C0BFEF4B0EFBBD884A" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_779449EF5BAD4B068A50802402E52278" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_8ADC98E4D05143999FFC87CAB78E68C9" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_B1B1C0011D7945F892A77F529772EA72" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BC1CD3A227FA4EB7B035DFA62EF4D82C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_CB89303C19364CECA36BDC911637BE9C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D98E545D77674640AD32C43168E2F93D" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E763DA578AC34798B710589F4C224BDE" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_E78854C05F3D4756B29D929C6E751845" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - } - "Configurations" - { - "Debug" - { - "DisplayName" = "8:Debug" - "IsDebugOnly" = "11:TRUE" - "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:Debug\\MonetDB-ODBC-Installer.msi" - "PackageFilesAs" = "3:2" - "PackageFileSize" = "3:-2147483648" - "CabType" = "3:1" - "Compression" = "3:2" - "SignOutput" = "11:FALSE" - "CertificateFile" = "8:" - "PrivateKeyFile" = "8:" - "TimeStampServer" = "8:" - "InstallerBootstrapper" = "3:2" - "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" - { - "Enabled" = "11:TRUE" - "PromptEnabled" = "11:TRUE" - "PrerequisitesLocation" = "2:1" - "Url" = "8:" - "ComponentsUrl" = "8:" - "Items" - { - } - } - } - "Release" - { - "DisplayName" = "8:Release" - "IsDebugOnly" = "11:FALSE" - "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\MonetDB-ODBC-Installer.msi" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
