Changeset: f075b298268d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f075b298268d Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/Tests/exports.stable.out-noapprove clients/mapilib/ChangeLog.Aug2018 common/stream/ChangeLog.Aug2018 gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 testing/ChangeLog.Aug2018 tools/merovingian/ChangeLog.Aug2018 Removed Files: ChangeLog buildtools/ChangeLog clients/ChangeLog clients/mapilib/ChangeLog common/stream/ChangeLog gdk/ChangeLog geom/ChangeLog monetdb5/ChangeLog sql/ChangeLog testing/ChangeLog tools/merovingian/ChangeLog Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_upgrades.c vertoo.data Branch: Aug2018 Log Message:
Step one towards a new stable branch "Aug2018". Incremented version numbers. Moved ChangeLog file to ChangeLog.Aug2018. The root of the stable branch is "Aug2018_root". diffs (274 lines): diff --git a/ChangeLog b/ChangeLog.Aug2018 rename from ChangeLog rename to ChangeLog.Aug2018 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.30.0 +%define version 11.31.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # groups of related archs 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 @@ -666,7 +666,7 @@ #define PACKAGE_URL "https://www.monetdb.org/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "11.30.0" +#define PACKAGE_VERSION "11.31.0" /* Path separator */ #define PATH_SEP ';' 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 - 2018 MonetDB B.V. -VERSION=11.30.0 +VERSION=11.31.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.Aug2018 rename from buildtools/ChangeLog rename to buildtools/ChangeLog.Aug2018 diff --git a/clients/ChangeLog b/clients/ChangeLog.Aug2018 rename from clients/ChangeLog rename to clients/ChangeLog.Aug2018 diff --git a/clients/Tests/exports.stable.out-noapprove b/clients/Tests/exports.stable.out-noapprove new file mode 100644 diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Aug2018 rename from clients/mapilib/ChangeLog rename to clients/mapilib/ChangeLog.Aug2018 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,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,31,0,1 + PRODUCTVERSION 11,31,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.30.0\0" + VALUE "FileVersion", "11.31.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.30.0\0" + VALUE "ProductVersion", "11.31.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,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,31,0,1 + PRODUCTVERSION 11,31,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.30.0\0" + VALUE "FileVersion", "11.31.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.30.0\0" + VALUE "ProductVersion", "11.31.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,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,31,0,1 + PRODUCTVERSION 11,31,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.30.0" + VALUE "FileVersion", "11.31.0" VALUE "InternalName", "libMonetODBCs.dll" VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018" VALUE "OriginalFilename", "libMonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", "11.30.0" + VALUE "ProductVersion", "11.31.0" END END BLOCK "VarFileInfo" diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Aug2018 rename from common/stream/ChangeLog rename to common/stream/ChangeLog.Aug2018 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -46,7 +46,7 @@ dnl configure file, whereas comments st dnl (including their trailing newline). AC_PREREQ([2.63]) -AC_INIT([MonetDB], [11.30.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) +AC_INIT([MonetDB], [11.31.0], [https://bugs.monetdb.org/], [MonetDB], [https://www.monetdb.org/]) AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.]) AC_CONFIG_AUX_DIR([buildtools/conf]) AC_CONFIG_MACRO_DIR([buildtools/conf]) diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Aug2018 rename from gdk/ChangeLog rename to gdk/ChangeLog.Aug2018 diff --git a/gdk/libbat.rc b/gdk/libbat.rc --- a/gdk/libbat.rc +++ b/gdk/libbat.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,31,0,1 + PRODUCTVERSION 11,31,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 Goblin Database Kernel DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.31.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", "libbat.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Common Libraries\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.31.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/geom/ChangeLog b/geom/ChangeLog.Aug2018 rename from geom/ChangeLog rename to geom/ChangeLog.Aug2018 diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog.Aug2018 rename from monetdb5/ChangeLog rename to monetdb5/ChangeLog.Aug2018 diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc --- a/monetdb5/tools/libmonetdb5.rc +++ b/monetdb5/tools/libmonetdb5.rc @@ -3,8 +3,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 VERSIONINFO - FILEVERSION 11,30,0,1 - PRODUCTVERSION 11,30,0,1 + FILEVERSION 11,31,0,1 + PRODUCTVERSION 11,31,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", "MonetDB5 Library DLL\0" - VALUE "FileVersion", "11.30.0\0" + VALUE "FileVersion", "11.31.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", "libmonetdb5.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB5 Server\0" - VALUE "ProductVersion", "11.30.0\0" + VALUE "ProductVersion", "11.31.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/sql/ChangeLog b/sql/ChangeLog.Aug2018 rename from sql/ChangeLog rename to sql/ChangeLog.Aug2018 diff --git a/sql/backends/monet5/sql_upgrades.c b/sql/backends/monet5/sql_upgrades.c --- a/sql/backends/monet5/sql_upgrades.c +++ b/sql/backends/monet5/sql_upgrades.c @@ -1716,7 +1716,7 @@ sql_update_gsl(Client c, mvc *sql) } static str -sql_update_default(Client c, mvc *sql) +sql_update_aug2018(Client c, mvc *sql) { size_t bufsize = 1000, pos = 0; char *buf, *err; @@ -1724,7 +1724,7 @@ sql_update_default(Client c, mvc *sql) schema = stack_get_string(sql, "current_schema"); if ((buf = GDKmalloc(bufsize)) == NULL) - throw(SQL, "sql_update_default", SQLSTATE(HY001) MAL_MALLOC_FAIL); + throw(SQL, "sql_update_aug2018", SQLSTATE(HY001) MAL_MALLOC_FAIL); pos += snprintf(buf + pos, bufsize - pos, "set schema sys;\n"); pos += snprintf(buf + pos, bufsize - pos, @@ -1964,7 +1964,7 @@ SQLupgrades(Client c, mvc *m) sql_find_subtype(&tp, "clob", 0, 0); if (sql_bind_aggr(m->sa, s, "group_concat", &tp) == NULL) { - if ((err = sql_update_default(c, m)) != NULL) { + if ((err = sql_update_aug2018(c, m)) != NULL) { fprintf(stderr, "!%s\n", err); freeException(err); } diff --git a/testing/ChangeLog b/testing/ChangeLog.Aug2018 rename from testing/ChangeLog rename to testing/ChangeLog.Aug2018 diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog.Aug2018 rename from tools/merovingian/ChangeLog rename to tools/merovingian/ChangeLog.Aug2018 diff --git a/vertoo.data b/vertoo.data --- a/vertoo.data +++ b/vertoo.data @@ -1,1 +1,1 @@ -monetdb = major:11; minor:30; release:0; +monetdb = major:11; minor:31; release:0; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list