Changeset: 1b84febeb292 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1b84febeb292
Modified Files:
        .hgtags
        MonetDB.spec
        cmake/monetdb-versions.cmake
Branch: Jun2023
Log Message:

Merge with Sep2022 branch.


diffs (138 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -802,3 +802,4 @@ 05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2
 ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_27
 ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_SP7_release
 d11af9398029c117b92a9be9efa971ac0299ffc4 Sep2022_15
+8b736d6dcfd63d0560c99fc5427b504c116b74b0 Sep2022_17
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -860,6 +860,14 @@ fi
 %endif
 
 %changelog
+* Tue Jun 06 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.17-20230606
+- Rebuilt.
+
+* Tue Jun  6 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.17-20230606
+- sql: Fixed a regression introduced in the previous build: when a table is
+  dropped in the same transaction where it was created, the data wasn't
+  removed from disk.
+
 * Tue May 30 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.15-20230530
 - Rebuilt.
 - GH#7360: Aggregates returning string crash
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 "26")
 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)
@@ -54,7 +54,7 @@ set(MAPI_VERSION "${MAPI_VERSION_MAJOR}.
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
 set(MONETDB5_VERSION_MAJOR "33")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "5")
+set(MONETDB5_VERSION_PATCH "6")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
@@ -72,5 +72,5 @@ set(STREAM_VERSION "${STREAM_VERSION_MAJ
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "13")
 set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "5")
+set(SQL_VERSION_PATCH "6")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.45.17) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 06 Jun 2023 10:54:35 +0200
+
+monetdb (11.45.17) unstable; urgency=low
+
+  * sql: Fixed a regression introduced in the previous build: when a table is
+    dropped in the same transaction where it was created, the data wasn't
+    removed from disk.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 6 Jun 2023 10:54:35 +0200
+
 monetdb (11.45.15) unstable; urgency=low
 
   * Rebuilt.
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,17 @@
+monetdb (11.45.17) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 06 Jun 2023 10:54:35 +0200
+
+monetdb (11.45.17) unstable; urgency=low
+
+  * sql: Fixed a regression introduced in the previous build: when a table is
+    dropped in the same transaction where it was created, the data wasn't
+    removed from disk.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 6 Jun 2023 10:54:35 +0200
+
 monetdb (11.45.15) 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,11 @@
+* Tue Jun 06 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.17-20230606
+- Rebuilt.
+
+* Tue Jun  6 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.17-20230606
+- sql: Fixed a regression introduced in the previous build: when a table is
+  dropped in the same transaction where it was created, the data wasn't
+  removed from disk.
+
 * Tue May 30 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.15-20230530
 - Rebuilt.
 - GH#7360: Aggregates returning string crash
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Jun  6 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.17-20230606
+- Fixed a regression introduced in the previous build: when a table is
+  dropped in the same transaction where it was created, the data wasn't
+  removed from disk.
+
 * Wed Apr  5 2023 Sjoerd Mullender <sjo...@acm.org> - 11.45.15-20230530
 - When creating a hot snapshot, allow other clients to proceed, even
   with updating queries.
diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022
--- a/sql/ChangeLog.Sep2022
+++ b/sql/ChangeLog.Sep2022
@@ -1,8 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Tue Jun  6 2023 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a regression introduced in the previous build: when a table is
-  dropped in the same transaction where it was created, the data wasn't
-  removed from disk.
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to