Changeset: 6576b166062a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6576b166062a
Branch: Jun2023
Log Message:
Merge heads.
diffs (truncated from 414 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.47.10
+current_version = 11.47.12
commit = False
tag = False
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -811,3 +811,4 @@ 573511e0e7bf2f7ab11f00b45711aab5f1aff6f2
573511e0e7bf2f7ab11f00b45711aab5f1aff6f2 Jun2023_SP1_release
ce63ebe9a78c52ef0cbe8fd6f2159d2637f0387c Jun2023_7
1efa83c6409769d13b2ee30e497d5f7ab42fa955 Jun2023_9
+6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
* Wed Aug 30 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.7-20230925
- Do a lot more error checking, mostly for allocation failures. More is
still needed, though.
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.47.10
+%global version 11.47.12
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -860,6 +860,13 @@ fi
%endif
%changelog
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- Rebuilt.
+
+* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.11-20230929
+- MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
* Wed Sep 27 2023 Sjoerd Mullender <sjo...@acm.org> - 11.47.9-20230927
- Rebuilt.
- GH#7402: Privileges on merge table not propagated to partition tables
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,47,10)
- PRODUCTVERSION version(11,47,10)
+ FILEVERSION version(11,47,12)
+ PRODUCTVERSION version(11,47,12)
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,47,10)
+ VALUE "FileVersion", sversion(11,47,12)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,47,10)
+ VALUE "ProductVersion", sversion(11,47,12)
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,47,10)
- PRODUCTVERSION version(11,47,10)
+ FILEVERSION version(11,47,12)
+ PRODUCTVERSION version(11,47,12)
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,47,10)
+ VALUE "FileVersion", sversion(11,47,12)
VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,47,10)
+ VALUE "ProductVersion", sversion(11,47,12)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/clients/odbc/tests/ODBCtester.c b/clients/odbc/tests/ODBCtester.c
--- a/clients/odbc/tests/ODBCtester.c
+++ b/clients/odbc/tests/ODBCtester.c
@@ -88,11 +88,7 @@ retrieveDiagMsg(SQLHANDLE stmt, char * o
/* The message layout is: "[MonetDB][ODBC Driver
11.46.0][MonetDB-Test]error/warning text".
The ODBC driver version numbers changes in time. Overwrite
it to get a stable output */
if (strncmp(msg, "[MonetDB][ODBC Driver 11.", 25) == 0) {
- for (int i = 25; msg[i] != ']'; i++) {
- if (isdigit(msg[i])) {
- msg[i] = '#';
- }
- }
+ return snprintf(outp, outp_len, "SQLstate %s, Errnr %d,
Message [MonetDB][ODBC Driver 11.##.#]%s\n", (char*)state, (int)errnr,
strchr(msg + 25, ']') + 1);
}
return snprintf(outp, outp_len, "SQLstate %s, Errnr %d, Message
%s\n", (char*)state, (int)errnr, (char*)msg);
}
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,47,10)
- PRODUCTVERSION version(11,47,10)
+ FILEVERSION version(11,47,12)
+ PRODUCTVERSION version(11,47,12)
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,47,10)
+ VALUE "FileVersion", sversion(11,47,12)
VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,47,10)
+ VALUE "ProductVersion", sversion(11,47,12)
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
@@ -10,7 +10,7 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "47")
-set(MONETDB_VERSION_PATCH "10")
+set(MONETDB_VERSION_PATCH "12")
if(RELEASE_VERSION)
set(MONETDB_RELEASE "unreleased")
@@ -42,7 +42,7 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
# common/options and common/utils)
set(GDK_VERSION_MAJOR "27")
set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "3")
+set(GDK_VERSION_PATCH "4")
set(GDK_VERSION
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
# version of the MAPI library (subdirectory clients/mapilib)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.47.11) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
+monetdb (11.47.11) unstable; urgency=low
+
+ * MonetDB: Fixed an installation issue on Debian and Ubuntu introduced in the
+ last build.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 29 Sep 2023 12:00:43 +0200
+
monetdb (11.47.9) unstable; urgency=low
* Rebuilt.
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -57,3 +57,6 @@ override_dh_auto_install:
rm debian/tmp/usr/lib/*/monetdb5/lib_opt_sql_append.so
rm debian/tmp/usr/lib/*/monetdb5/lib_microbenchmark*.so
rm debian/tmp/usr/lib/*/monetdb5/lib_udf*.so
+
+override_dh_installsystemd:
+ dh_installsystemd --no-enable --no-start
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1038,17 +1038,8 @@ log_create_types_file(logger *lg, const
return GDK_SUCCEED;
}
-static inline void
-rotation_lock(logger *lg)
-{
- MT_lock_set(&lg->rotation_lock);
-}
-
-static inline void
-rotation_unlock(logger *lg)
-{
- MT_lock_unset(&lg->rotation_lock);
-}
+#define rotation_lock(lg) MT_lock_set(&(lg)->rotation_lock)
+#define rotation_unlock(lg) MT_lock_unset(&(lg)->rotation_lock)
static gdk_return
log_open_output(logger *lg)
@@ -2285,7 +2276,6 @@ do_flush_range_cleanup(logger *lg)
logged_range *flast = frange;
lg->flush_ranges = flast;
- rotation_unlock(lg);
for (frange = first; frange && frange != flast; frange = frange->next) {
ATOMIC_DEC(&frange->refcount);
@@ -2296,6 +2286,7 @@ do_flush_range_cleanup(logger *lg)
ATOMIC_DEC(&lg->nr_open_files);
}
}
+ rotation_unlock(lg);
return flast;
}
@@ -2416,6 +2407,7 @@ log_next_logfile(logger *lg, ulng ts)
static void
log_cleanup_range(logger *lg, ulng id)
{
+ rotation_lock(lg);
while (lg->pending && lg->pending->id <= id) {
logged_range *p;
p = lg->pending;
@@ -2423,6 +2415,7 @@ log_cleanup_range(logger *lg, ulng id)
lg->pending = p->next;
GDKfree(p);
}
+ rotation_unlock(lg);
}
static void
@@ -2536,9 +2529,9 @@ log_flush(logger *lg, ulng ts)
log_unlock(lg);
return GDK_FAIL;
}
+ updated = p;
memset(updated + allocated / 4, 0, a -
allocated);
allocated = a;
- updated = p;
}
nupdated = n;
}
@@ -3036,17 +3029,8 @@ log_tend(logger *lg)
return result;
}
-static inline void
-flush_lock(logger *lg)
-{
- MT_lock_set(&lg->flush_lock);
-}
-
-static inline void
-flush_unlock(logger *lg)
-{
- MT_lock_unset(&lg->flush_lock);
-}
+#define flush_lock(lg) MT_lock_set(&(lg)->flush_lock)
+#define flush_unlock(lg) MT_lock_unset(&(lg)->flush_lock)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
