Changeset: a7ba64e33165 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7ba64e33165 Added Files: ChangeLog.Jul2017 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/nestedoperators.Bug-6292.sql testing/ChangeLog.Jul2017 tools/merovingian/ChangeLog.Jul2017 Modified Files: .hgtags ChangeLog MonetDB.spec NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc clients/ChangeLog clients/mapiclient/dump.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/ChangeLog gdk/libbat.rc monetdb5/ChangeLog monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/sql_upgrades.c sql/test/BugTracker-2017/Tests/All 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 vertoo.data Branch: data-vaults Log Message:
Merge branch 'master' into branches/data-vaults diffs (truncated from 674 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -667,3 +667,4 @@ 07824a1c7beb75308b813378af33c243f1c2f511 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,27 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* 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, - 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 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 diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py --- a/NT/mkgeomwxs.py +++ b/NT/mkgeomwxs.py @@ -32,6 +32,7 @@ def main(): else: folder = r'ProgramFilesFolder' arch = 'x86' + vs = os.getenv('vs') # inherited from TestTools\common.bat features = [] print(r'<?xml version="1.0"?>') print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>') @@ -47,7 +48,7 @@ def main(): print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') print(r' <Directory Id="TARGETDIR" Name="SourceDir">') - print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch) + print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) print(r' <Directory Id="%s">' % folder) print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">') print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">') diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -35,6 +35,7 @@ def main(): else: folder = r'ProgramFilesFolder' arch = 'x86' + vs = os.getenv('vs') # inherited from TestTools\common.bat features = [] print(r'<?xml version="1.0"?>') print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>') @@ -49,7 +50,7 @@ def main(): print(r' <CustomAction Id="driverinstall" FileKey="odbcinstall" ExeCommand="/Install" Execute="deferred" Impersonate="no"/>') print(r' <CustomAction Id="driveruninstall" FileKey="odbcinstall" ExeCommand="/Uninstall" Execute="deferred" Impersonate="no"/>') print(r' <Directory Id="TARGETDIR" Name="SourceDir">') - print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch) + print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) print(r' <Directory Id="%s">' % folder) print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">') print(r' <Directory Id="INSTALLDIR" Name="MonetDB ODBC Driver">') diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -35,6 +35,7 @@ def main(): else: folder = r'ProgramFilesFolder' arch = 'x86' + vs = os.getenv('vs') # inherited from TestTools\common.bat features = [] print(r'<?xml version="1.0"?>') print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>') @@ -50,7 +51,7 @@ def main(): print(r' <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>') print(r' <Media Id="1" Cabinet="monetdb.cab" EmbedCab="yes"/>') print(r' <Directory Id="TARGETDIR" Name="SourceDir">') - print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_%s.msm"/>' % arch) + print(r' <Merge Id="VCRedist" DiskId="1" Language="0" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC%s0_CRT_%s.msm"/>' % (vs, arch)) print(r' <Directory Id="%s">' % folder) print(r' <Directory Id="ProgramFilesMonetDB" Name="MonetDB">') print(r' <Directory Id="INSTALLDIR" Name="MonetDB5">') diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -774,13 +774,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.26.0" +#define PACKAGE_STRING "MonetDB 11.28.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "MonetDB" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.26.0" +#define PACKAGE_VERSION "11.28.0" /* Define to the home page for this package. */ #define PACKAGE_URL "" diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -6,7 +6,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2017 MonetDB B.V. -VERSION=11.26.0 +VERSION=11.28.0 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Jul2017 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Jul2017 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,20 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Mon Dec 12 2016 Sjoerd Mullender <sjo...@acm.org> -- The mclient and msqldump programs lost compatibility with old - mserver5 versions (pre 2014) which didn't have a "system" column in - the sys.schemas table. -- The mclient and msqldump programs lost compatibility with ancient - mserver5 versions (pre 2011) which didn't have the sys.systemfunctions - table. - -* Wed Nov 16 2016 Sjoerd Mullender <sjo...@acm.org> -- Removed the "array" and "quick" functions from the mapi library. - To be precise, the removed functions are: mapi_execute_array, - mapi_fetch_field_array, mapi_prepare_array, mapi_query_array, - mapi_quick_query, mapi_quick_query_array, and mapi_quick_response. - -* Sun Oct 30 2016 Martin Kersten <m...@cwi.nl> -- Added a more elaborate \help command for SQL expressions. - diff --git a/clients/ChangeLog.Jul2017 b/clients/ChangeLog.Jul2017 new file mode 100644 --- /dev/null +++ b/clients/ChangeLog.Jul2017 @@ -0,0 +1,20 @@ +# ChangeLog file for clients +# This file is updated with Maddlog + +* Mon Dec 12 2016 Sjoerd Mullender <sjo...@acm.org> +- The mclient and msqldump programs lost compatibility with old + mserver5 versions (pre 2014) which didn't have a "system" column in + the sys.schemas table. +- The mclient and msqldump programs lost compatibility with ancient + mserver5 versions (pre 2011) which didn't have the sys.systemfunctions + table. + +* Wed Nov 16 2016 Sjoerd Mullender <sjo...@acm.org> +- Removed the "array" and "quick" functions from the mapi library. + To be precise, the removed functions are: mapi_execute_array, + mapi_fetch_field_array, mapi_prepare_array, mapi_query_array, + mapi_quick_query, mapi_quick_query_array, and mapi_quick_response. + +* Sun Oct 30 2016 Martin Kersten <m...@cwi.nl> +- Added a more elaborate \help command for SQL expressions. + diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -1141,7 +1141,9 @@ dump_table_data(Mapi mid, char *schema, for (i = 0; i < cnt; i++) { string[i] = (strcmp(mapi_get_type(hdl, i), "char") == 0 || strcmp(mapi_get_type(hdl, i), "varchar") == 0 || - strcmp(mapi_get_type(hdl, i), "clob") == 0); + strcmp(mapi_get_type(hdl, i), "clob") == 0 || + strcmp(mapi_get_type(hdl, i), "timestamp") == 0 || + strcmp(mapi_get_type(hdl, i), "timestamptz") == 0); } while (mapi_fetch_row(hdl)) { char *s; diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jul2017 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Jul2017 diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,26,0,1 - PRODUCTVERSION 11,26,0,1 + FILEVERSION 11,28,0,1 + PRODUCTVERSION 11,28,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", "11.26.0\0" + VALUE "FileVersion", "11.28.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", "11.26.0\0" + VALUE "ProductVersion", "11.28.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc --- a/clients/odbc/driver/driver.rc +++ b/clients/odbc/driver/driver.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,26,0,1 - PRODUCTVERSION 11,26,0,1 + FILEVERSION 11,28,0,1 + PRODUCTVERSION 11,28,0,1 FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,7 +18,7 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", "11.26.0\0" + VALUE "FileVersion", "11.28.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. @@ -28,7 +28,7 @@ BEGIN VALUE "OriginalFilename", "libMonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", "11.26.0\0" + VALUE "ProductVersion", "11.28.0\0" // ^^^^^^^^ // Maintained via vertoo. Please don't modify by hand! // Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc --- a/clients/odbc/winsetup/setup.rc +++ b/clients/odbc/winsetup/setup.rc @@ -62,8 +62,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 11,26,0,1 - PRODUCTVERSION 11,26,0,1 + FILEVERSION 11,28,0,1 + PRODUCTVERSION 11,28,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,12 +80,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB B.V." VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", "11.26.0" + VALUE "FileVersion", "11.28.0" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
