Changeset: 60f1ae2bf159 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/60f1ae2bf159
Modified Files:
        .hgtags
        MonetDB.spec
        cmake/monetdb-versions.cmake
        debian/changelog
        misc/packages/deb/changelog
        misc/packages/rpm/changelog
Branch: default
Log Message:

Merge with Jun2023 branch.


diffs (138 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -814,3 +814,4 @@ 1efa83c6409769d13b2ee30e497d5f7ab42fa955
 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_11
 6f88424ebfd9d82c072cf21d89070e04321983da Jun2023_SP2_release
 e6eb06773c17035954ac5d001cfe1f09ff3425cc Jun2023_13
+5683fd900f28d65ad7c98d1ed1efd992023a7fa4 Jun2023_15
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -867,6 +867,17 @@ fi
 %endif
 
 %changelog
+* Thu Nov 09 2023 Sjoerd Mullender <[email protected]> - 11.47.15-20231109
+- Rebuilt.
+- GH#7410: SIGSEGV cause database corruption
+
+* Tue Nov  7 2023 Sjoerd Mullender <[email protected]> - 11.47.15-20231109
+- gdk: When saving the SQL catalog during a low-level commit, we should
+  only save the part of the catalog that corresponds to the part of the
+  write-ahead log that has been processed.  What we did was save more,
+  which resulted in the catalog containing references to tables and
+  columns whose disk presence is otherwise only in the write-ahead log.
+
 * Fri Nov 03 2023 Sjoerd Mullender <[email protected]> - 11.47.13-20231103
 - Rebuilt.
 - GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -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 "5")
+set(GDK_VERSION_PATCH "6")
 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,20 @@
+monetdb (11.47.15) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7410: SIGSEGV cause database corruption
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 09 Nov 2023 17:03:15 +0100
+
+monetdb (11.47.15) unstable; urgency=low
+
+  * gdk: When saving the SQL catalog during a low-level commit, we should
+    only save the part of the catalog that corresponds to the part of the
+    write-ahead log that has been processed.  What we did was save more,
+    which resulted in the catalog containing references to tables and
+    columns whose disk presence is otherwise only in the write-ahead log.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 7 Nov 2023 17:03:15 +0100
+
 monetdb (11.47.13) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Nov  7 2023 Sjoerd Mullender <[email protected]> - 11.47.15-20231109
+- When saving the SQL catalog during a low-level commit, we should
+  only save the part of the catalog that corresponds to the part of the
+  write-ahead log that has been processed.  What we did was save more,
+  which resulted in the catalog containing references to tables and
+  columns whose disk presence is otherwise only in the write-ahead log.
+
 * Tue Oct 31 2023 Sjoerd Mullender <[email protected]> - 11.47.13-20231103
 - A bug was fixed where the administration of which bats were in use was
   interpreted incorrectly during startup, causing problems later.  One
diff --git a/gdk/ChangeLog.Jun2023 b/gdk/ChangeLog.Jun2023
--- a/gdk/ChangeLog.Jun2023
+++ b/gdk/ChangeLog.Jun2023
@@ -1,10 +1,3 @@
 # ChangeLog file for GDK
 # This file is updated with Maddlog
 
-* Tue Nov  7 2023 Sjoerd Mullender <[email protected]>
-- When saving the SQL catalog during a low-level commit, we should
-  only save the part of the catalog that corresponds to the part of the
-  write-ahead log that has been processed.  What we did was save more,
-  which resulted in the catalog containing references to tables and
-  columns whose disk presence is otherwise only in the write-ahead log.
-
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -1,3 +1,20 @@
+monetdb (11.47.15) unstable; urgency=low
+
+  * Rebuilt.
+  * GH#7410: SIGSEGV cause database corruption
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 09 Nov 2023 17:03:15 +0100
+
+monetdb (11.47.15) unstable; urgency=low
+
+  * gdk: When saving the SQL catalog during a low-level commit, we should
+    only save the part of the catalog that corresponds to the part of the
+    write-ahead log that has been processed.  What we did was save more,
+    which resulted in the catalog containing references to tables and
+    columns whose disk presence is otherwise only in the write-ahead log.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 7 Nov 2023 17:03:15 +0100
+
 monetdb (11.47.13) unstable; urgency=low
 
   * Rebuilt.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,14 @@
+* Thu Nov 09 2023 Sjoerd Mullender <[email protected]> - 11.47.15-20231109
+- Rebuilt.
+- GH#7410: SIGSEGV cause database corruption
+
+* Tue Nov  7 2023 Sjoerd Mullender <[email protected]> - 11.47.15-20231109
+- gdk: When saving the SQL catalog during a low-level commit, we should
+  only save the part of the catalog that corresponds to the part of the
+  write-ahead log that has been processed.  What we did was save more,
+  which resulted in the catalog containing references to tables and
+  columns whose disk presence is otherwise only in the write-ahead log.
+
 * Fri Nov 03 2023 Sjoerd Mullender <[email protected]> - 11.47.13-20231103
 - Rebuilt.
 - GH#7300: Implement missing standard SQL DATE and TIMESTAMP functions
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to