Changeset: 1f36891ada9f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f36891ada9f
Branch: typing
Log Message:
merged
diffs (288 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.0
+current_version = 11.40.0
commit = False
tag = False
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for devel
+# This file is updated with Maddlog
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.0
+%global version 11.40.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/ChangeLog b/clients/ChangeLog
new file mode 100644
--- /dev/null
+++ b/clients/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for clients
+# This file is updated with Maddlog
+
diff --git a/clients/Tests/exports.stable.out-noapprove
b/clients/Tests/exports.stable.out-noapprove
deleted file mode 100644
diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog
new file mode 100644
--- /dev/null
+++ b/clients/mapilib/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for mapilib
+# This file is updated with Maddlog
+
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,0)
- PRODUCTVERSION version(11,39,0)
+ FILEVERSION version(11,40,0)
+ PRODUCTVERSION version(11,40,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", sversion(11,39,0)
+ VALUE "FileVersion", sversion(11,40,0)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,0)
+ VALUE "ProductVersion", sversion(11,40,0)
VALUE "SpecialBuild", "\0"
END
END
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
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,0)
- PRODUCTVERSION version(11,39,0)
+ FILEVERSION version(11,40,0)
+ PRODUCTVERSION version(11,40,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", sversion(11,39,0)
+ VALUE "FileVersion", sversion(11,40,0)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,0)
+ VALUE "ProductVersion", sversion(11,40,0)
VALUE "SpecialBuild", "\0"
END
END
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
@@ -65,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,39,0)
- PRODUCTVERSION version(11,39,0)
+ FILEVERSION version(11,40,0)
+ PRODUCTVERSION version(11,40,0)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", sversion(11,39,0)
+ VALUE "FileVersion", sversion(11,40,0)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,39,0)
+ VALUE "ProductVersion", sversion(11,40,0)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -7,7 +7,7 @@
#]]
set(MONETDB_VERSION_MAJOR "11")
-set(MONETDB_VERSION_MINOR "39")
+set(MONETDB_VERSION_MINOR "40")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog
new file mode 100644
--- /dev/null
+++ b/common/stream/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for stream
+# This file is updated with Maddlog
+
diff --git a/gdk/ChangeLog b/gdk/ChangeLog
new file mode 100644
--- /dev/null
+++ b/gdk/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for GDK
+# This file is updated with Maddlog
+
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,0)
- PRODUCTVERSION version(11,39,0)
+ FILEVERSION version(11,40,0)
+ PRODUCTVERSION version(11,40,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,39,0)
+ VALUE "FileVersion", sversion(11,40,0)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,39,0)
+ VALUE "ProductVersion", sversion(11,40,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/geom/ChangeLog b/geom/ChangeLog
new file mode 100644
--- /dev/null
+++ b/geom/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for geom
+# This file is updated with Maddlog
+
diff --git a/misc/ChangeLog b/misc/ChangeLog
new file mode 100644
--- /dev/null
+++ b/misc/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for buildtools
+# This file is updated with Maddlog
+
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
new file mode 100644
--- /dev/null
+++ b/monetdb5/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for MonetDB5
+# This file is updated with Maddlog
+
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
1 VERSIONINFO
- FILEVERSION version(11,39,0)
- PRODUCTVERSION version(11,39,0)
+ FILEVERSION version(11,40,0)
+ PRODUCTVERSION version(11,40,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
- VALUE "FileVersion", sversion(11,39,0)
+ VALUE "FileVersion", sversion(11,40,0)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,39,0)
+ VALUE "ProductVersion", sversion(11,40,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/sql/ChangeLog b/sql/ChangeLog
new file mode 100644
--- /dev/null
+++ b/sql/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for sql
+# This file is updated with Maddlog
+
diff --git a/testing/ChangeLog b/testing/ChangeLog
new file mode 100644
--- /dev/null
+++ b/testing/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for testing
+# This file is updated with Maddlog
+
diff --git a/tools/merovingian/ChangeLog b/tools/merovingian/ChangeLog
new file mode 100644
--- /dev/null
+++ b/tools/merovingian/ChangeLog
@@ -0,0 +1,3 @@
+# ChangeLog file for sql/src/backends/monet5/merovingian
+# This file is updated with mchangelog
+
diff --git a/tools/merovingian/client/Tests/monetdbd.py
b/tools/merovingian/client/Tests/monetdbd.py
--- a/tools/merovingian/client/Tests/monetdbd.py
+++ b/tools/merovingian/client/Tests/monetdbd.py
@@ -22,7 +22,8 @@ class MonetDBD:
def __init__(self, farmdir, keep=False, set_snapdir=True):
self.farmdir = farmdir
self.keep = keep
- # do not try this at home, but this test depends on it: (see
.prepare_dir)
+ # It's generally a bad idea to put the snapshot dir inside the database
+ # farm but this test depends on it, see .prepare_dir
self.snapdir = os.path.join(farmdir, 'MTESTSNAPS')
self.qfarmdir = pipes.quote(farmdir)
self.qsnapdir = pipes.quote(self.snapdir)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
