Changeset: 6bc6f09d1529 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bc6f09d1529
Added Files:
ChangeLog.Apr2019
buildtools/ChangeLog.Apr2019
clients/ChangeLog.Apr2019
clients/mapilib/ChangeLog.Apr2019
common/stream/ChangeLog.Apr2019
gdk/ChangeLog.Apr2019
geom/ChangeLog.Apr2019
monetdb5/ChangeLog.Apr2019
sql/ChangeLog.Apr2019
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/sys-schema/Tests/check_MaxStrLength_violations.sql
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.err
sql/test/sys-schema/Tests/check_MaxStrLength_violations.stable.out
sql/test/sys-schema/Tests/netcdf_tables_checks.sql
sql/test/sys-schema/Tests/netcdf_tables_checks.stable.err
sql/test/sys-schema/Tests/netcdf_tables_checks.stable.out
sql/test/sys-schema/Tests/update_statistics.sql
sql/test/sys-schema/Tests/update_statistics.stable.err
sql/test/sys-schema/Tests/update_statistics.stable.out
testing/ChangeLog.Apr2019
tools/merovingian/ChangeLog.Apr2019
Modified Files:
.hgtags
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
clients/ChangeLog
clients/mapilib/ChangeLog
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
common/stream/ChangeLog
configure.ag
gdk/ChangeLog
gdk/libbat.rc
monetdb5/ChangeLog
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog
sql/backends/monet5/sql_upgrades.c
sql/server/sql_mvc.c
sql/storage/store.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/sys-schema/Tests/All
sql/test/sys-schema/Tests/bam_tables_checks.sql
sql/test/sys-schema/Tests/bam_tables_checks.stable.out
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.sql
sql/test/sys-schema/Tests/check_AlternateKey_uniqueness.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_Not_Nullable_columns.sql
sql/test/sys-schema/Tests/check_Not_Nullable_columns.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
sql/test/sys-schema/Tests/geom_tables_checks.sql
sql/test/sys-schema/Tests/geom_tables_checks.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
vertoo.data
Branch: ipv6
Log Message:
Merge with default.
diffs (truncated from 78003 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -719,3 +719,4 @@ a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release
a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_13
a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_SP2_release
+8db7bfce6045f2ad86d5898946d3e712495c96a3 Apr2019_root
diff --git a/ChangeLog b/ChangeLog.Apr2019
copy from ChangeLog
copy to ChangeLog.Apr2019
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.32.0
+%global version 11.34.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
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.32.0"
+#define PACKAGE_VERSION "11.34.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 - 2019 MonetDB B.V.
-VERSION=11.32.0
+VERSION=11.34.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
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Wed Aug 29 2018 Sjoerd Mullender <sjo...@acm.org>
-- We now also build the Python 3 integration packages for Fedora, Debian,
- and Ubuntu (not for Debian 8 or Ubuntu 14.04 which are too old).
-
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Apr2019
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Apr2019
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,8 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Oct 11 2018 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
-- The mclient program can now be quit by typing quit or exit on the
- command-line. This makes it easier for novice users to quit the program
- if they do not know that the standard command to quit is \q.
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Apr2019
copy from clients/ChangeLog
copy to clients/ChangeLog.Apr2019
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog
--- a/clients/mapilib/ChangeLog
+++ b/clients/mapilib/ChangeLog
@@ -1,7 +1,3 @@
# ChangeLog file for mapilib
# This file is updated with Maddlog
-* Wed Sep 12 2018 Sjoerd Mullender <sjo...@acm.org>
-- Removed function mapi_cache_shuffle.
-- Removed function mapi_stream_query.
-
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Apr2019
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Apr2019
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,32,0,1
- PRODUCTVERSION 11,32,0,1
+ FILEVERSION 11,34,0,1
+ PRODUCTVERSION 11,34,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.32.0\0"
+ VALUE "FileVersion", "11.34.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.32.0\0"
+ VALUE "ProductVersion", "11.34.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,32,0,1
- PRODUCTVERSION 11,32,0,1
+ FILEVERSION 11,34,0,1
+ PRODUCTVERSION 11,34,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.32.0\0"
+ VALUE "FileVersion", "11.34.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.32.0\0"
+ VALUE "ProductVersion", "11.34.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,32,0,1
- PRODUCTVERSION 11,32,0,1
+ FILEVERSION 11,34,0,1
+ PRODUCTVERSION 11,34,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.32.0"
+ VALUE "FileVersion", "11.34.0"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2019"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.32.0"
+ VALUE "ProductVersion", "11.34.0"
END
END
BLOCK "VarFileInfo"
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog
--- a/common/stream/ChangeLog
+++ b/common/stream/ChangeLog
@@ -1,19 +1,3 @@
# ChangeLog file for stream
# This file is updated with Maddlog
-* Wed Sep 19 2018 Sjoerd Mullender <sjo...@acm.org>
-- The functions mnstr_write{Sht,Int,Lng,Hge} and their Array variants
- now swap bytes of the written values if the stream is set to swap bytes
- (i.e. big-endian on a little-endian machine and v.v.).
-- Removed defines ST_ASCII, ST_BIN, ST_READ, ST_WRITE from stream.h.
-- Changed function mnstr_set_byteorder(stream, char) to
- mnstr_set_bigendian(stream, bool) where the second argument should
- be `true' for specifying that the stream is bigendian. This sets an
- internal flag whether or not to swap bytes which can be retrieved
- with mnstr_get_swapbytes(stream).
-- Changed function `int mnstr_byteorder(stream)' to `bool
- mnstr_get_swapbytes(stream)'; it now returns whether bytes are
- swapped.
-- Changed function `int mnstr_type(stream)' to `bool
- mnstr_isbinary(stream)'.
-
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Apr2019
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Apr2019
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -52,7 +52,7 @@ dnl configure file, whereas comments st
dnl (including their trailing newline).
AC_PREREQ([2.63b])
-AC_INIT([MonetDB], [11.32.0], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.34.0], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,35 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Mon Nov 12 2018 Sjoerd Mullender <sjo...@acm.org>
-- Added an extra argument of type `bool' to the atom to string and
- string to atom methods to indicate whether the string is for
- internal use (casting the value to or from a string) of external use
- (to be printed).
-
-* Wed Nov 7 2018 Sjoerd Mullender <sjo...@acm.org>
-- Implemented a nilslast option for BATfirstn. If set, NILs come
- last in the ordering that BATfirstn simulates, so non-NIL values are
- preferentially returned. The old behavior can be obtained by setting
- nilslast to !asc(ending).
-
-* Tue Nov 6 2018 Sjoerd Mullender <sjo...@acm.org>
-- Implemented a nilslast option for BATsort. This option should be
- equal to the reverse option for stable sort (it is not implemented for
- stable sort), but can be different from reverse for non-stable sort.
- The functions BATsort and GDKqsort have extra parameters, the function
- GDKqsort_rev has been removed (superseded by GDKqsort with the new
- `reverse' parameter).
-
-* Tue Oct 30 2018 Sjoerd Mullender <sjo...@acm.org>
-- The BUNtail, BUNtvar, BUNtloc, and BUNtpos macros (and Tloc and Tpos)
- now return a `void *' instead of a `char *'.
-
-* Tue Aug 21 2018 Sjoerd Mullender <sjo...@acm.org>
-- Function PROPdestroy now takes a BAT* parameter.
-
-* Wed Aug 15 2018 Sjoerd Mullender <sjo...@acm.org>
-- A whole bunch of functions now take a bool argument instead of an
- int argument. Some functions now return a bool instead of an int.
- In all these cases, the int was used as a Boolean value.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Apr2019
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Apr2019
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,32,0,1
- PRODUCTVERSION 11,32,0,1
+ FILEVERSION 11,34,0,1
+ PRODUCTVERSION 11,34,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.32.0\0"
+ VALUE "FileVersion", "11.34.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.32.0\0"
+ VALUE "ProductVersion", "11.34.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.Apr2019
copy from geom/ChangeLog
copy to geom/ChangeLog.Apr2019
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,11 +1,3 @@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
