Changeset: acfc276b5ba5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=acfc276b5ba5
Added Files:
ChangeLog.Mar2018
buildtools/ChangeLog.Mar2018
clients/ChangeLog.Mar2018
clients/mapilib/ChangeLog.Mar2018
common/stream/ChangeLog.Mar2018
gdk/ChangeLog.Mar2018
geom/ChangeLog.Mar2018
monetdb5/ChangeLog.Mar2018
sql/ChangeLog.Mar2018
testing/ChangeLog.Mar2018
tools/merovingian/ChangeLog.Mar2018
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
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
testing/ChangeLog
tools/merovingian/ChangeLog
vertoo.data
Branch: default
Log Message:
Step two towards a new stable branch "Mar2018".
Increment version numbers.
>From now on, *all* bug fixes, and *only* bug fixes, *must* go to the
stable branch with the name "Mar2018".
diffs (truncated from 512 to 300 lines):
diff --git a/ChangeLog b/ChangeLog.Mar2018
copy from ChangeLog
copy to ChangeLog.Mar2018
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.28.0
+%define version 11.30.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.28.0"
+#define PACKAGE_VERSION "11.30.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.28.0
+VERSION=11.30.0
# ^^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [email protected] for details and/or
assistance.
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Mar2018
copy from buildtools/ChangeLog
copy to buildtools/ChangeLog.Mar2018
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,29 +1,3 @@
# ChangeLog file for clients
# This file is updated with Maddlog
-* Thu Feb 1 2018 Sjoerd Mullender <[email protected]>
-- ODBC: Changed table types as used by SQLTables from "LOCAL TEMPORARY"
- and "GLOBAL TEMPORARY" to "LOCAL TEMPORARY TABLE" and "GLOBAL TEMPORARY
- TABLE" respectively.
-
-* Wed Jan 31 2018 Sjoerd Mullender <[email protected]>
-- ODBC: Initial support for the HUGEINT type in SQL was added. Any value
- with type HUGEINT can be retrieved in a C variable with type SQL_C_CHAR
- or SQL_C_WCHAR. A value of type HUGEINT can be retrieved in other C
- types as long as they fit, the largest C type supported being a 64 bit
- integer (equivalent to BIGINT).
-
-* Thu Nov 16 2017 Sjoerd Mullender <[email protected]>
-- The functions in the mapi library that require 64 bit integers now
- use the standard type int64_t instead of the non-standard mapi_int64.
- This requires a compilation environment that has the stdint.h include
- file (standardized in C99). Compilation of the library also requires
- the inttypes.h include file (also standardized in C99).
-
-* Mon Jul 17 2017 Panagiotis Koutsourakis <[email protected]>
-- Add a new pretty printing option to stethoscope
- Running stethoscope with the flag -j will produce not pretty printed
- output (one json object per line). Running with the -y flag will produce
- pretty printed output. Running with neither, wiil produce the legacy,
- line oriented format
-
diff --git a/clients/ChangeLog b/clients/ChangeLog.Mar2018
copy from clients/ChangeLog
copy to clients/ChangeLog.Mar2018
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog
--- a/clients/mapilib/ChangeLog
+++ b/clients/mapilib/ChangeLog
@@ -1,10 +1,3 @@
# ChangeLog file for mapilib
# This file is updated with Maddlog
-* Tue Aug 1 2017 Sjoerd Mullender <[email protected]>
-- The functions mapi_error_str and mapi_result_error now return const char
- * instead of plain char * to indicate that the returned data belongs
- to the library and should not be changed or freed by the application.
-- New function const char *mapi_result_errorcode(MapiHdl) which returns
- the SQLSTATE code if available when an error has occurred.
-
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Mar2018
copy from clients/mapilib/ChangeLog
copy to clients/mapilib/ChangeLog.Mar2018
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,28,0,1
- PRODUCTVERSION 11,28,0,1
+ FILEVERSION 11,30,0,1
+ PRODUCTVERSION 11,30,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.28.0\0"
+ VALUE "FileVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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.28.0\0"
+ VALUE "ProductVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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,28,0,1
- PRODUCTVERSION 11,28,0,1
+ FILEVERSION 11,30,0,1
+ PRODUCTVERSION 11,30,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.28.0\0"
+ VALUE "FileVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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.28.0\0"
+ VALUE "ProductVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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,28,0,1
- PRODUCTVERSION 11,28,0,1
+ FILEVERSION 11,30,0,1
+ PRODUCTVERSION 11,30,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.28.0"
+ VALUE "FileVersion", "11.30.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.28.0"
+ VALUE "ProductVersion", "11.30.0"
END
END
BLOCK "VarFileInfo"
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog
--- a/common/stream/ChangeLog
+++ b/common/stream/ChangeLog
@@ -1,17 +1,3 @@
# ChangeLog file for stream
# This file is updated with Maddlog
-* Tue Nov 21 2017 Sjoerd Mullender <[email protected]>
-- The interface of mnstr_fgetpos and mnstr_fsetpos was changed to look
- more like the standard C functions fsetpos and fgetpos: they both have
- a second argument "pointer to fpos_t".
-
-* Tue Aug 8 2017 Sjoerd Mullender <[email protected]>
-- Removed function wbstream.
-
-* Mon Aug 7 2017 Sjoerd Mullender <[email protected]>
-- Removed functions udp_rastream and udp_wastream.
-- Removed functions socket_rstream and socket_wstream.
-- Removed functions append_wstream and append_wastream.
-- Removed functions mnstr_rstream and mnstr_wstream.
-
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Mar2018
copy from common/stream/ChangeLog
copy to common/stream/ChangeLog.Mar2018
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.28.0], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.30.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
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,27 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Thu Jan 18 2018 Sjoerd Mullender <[email protected]>
-- Removed unused functions BATmemsize and BATvmsize.
-- Removed the tnodense property: it was maintained but never actually
- used, not even stored.
-
-* Tue Nov 7 2017 Sjoerd Mullender <[email protected]>
-- The NIL representation of the internal flt and dbl types was changed
- from the smallest representable finite value to NaN (not-a-number).
-
-* Mon Sep 18 2017 Sjoerd Mullender <[email protected]>
-- Changed the interface of ATOMformat and VALformat: they now return a
- pointer to the allocated string.
-
-* Thu Sep 14 2017 Sjoerd Mullender <[email protected]>
-- The length "method" for atoms now returns a size_t, the "len" field of
- a ValRecord is now a size_t, the "size" field of the atomDesc structure
- is now unsigned short.
-- Removed the "align" field from the ATOM descriptor (atomDesc) structure.
-- The atomtostr and atomfromstr "methods" for atoms now return ssize_t
- and require a pointer to size_t for the size of the buffer.
-- The atom tostr and fromstr "methods" now always return -1 on error.
- A return value greater than 0 is normal, a return value of 0 is not
- normal, but technically not an error.
-
diff --git a/gdk/ChangeLog b/gdk/ChangeLog.Mar2018
copy from gdk/ChangeLog
copy to gdk/ChangeLog.Mar2018
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,28,0,1
- PRODUCTVERSION 11,28,0,1
+ FILEVERSION 11,30,0,1
+ PRODUCTVERSION 11,30,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.28.0\0"
+ VALUE "FileVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] 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.28.0\0"
+ VALUE "ProductVersion", "11.30.0\0"
// ^^^^^^^^
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
diff --git a/geom/ChangeLog b/geom/ChangeLog.Mar2018
copy from geom/ChangeLog
copy to geom/ChangeLog.Mar2018
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,27 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Jan 24 2018 Sjoerd Mullender <[email protected]>
-- Implemented function pcre.replace_first which is like pcre.replace,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
