Changeset: 3ca9c804d37a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ca9c804d37a
Branch: default
Log Message:
merged
diffs (truncated from 911 to 300 lines):
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/ChangeLog.Jun2023 b/ChangeLog.Jun2023
--- a/ChangeLog.Jun2023
+++ b/ChangeLog.Jun2023
@@ -1,7 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Fri Sep 29 2023 Sjoerd Mullender <sjo...@acm.org>
-- Fixed an installation issue on Debian and Ubuntu introduced in the
- last build.
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -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/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 "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/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2529,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;
}
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,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/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -1,3 +1,10 @@
+* 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/monetdb5/modules/atoms/Tests/json01.maltest
b/monetdb5/modules/atoms/Tests/json01.maltest
--- a/monetdb5/modules/atoms/Tests/json01.maltest
+++ b/monetdb5/modules/atoms/Tests/json01.maltest
@@ -18,7 +18,7 @@ f:= json.filter(b,"f1")
query T rowsort
io.print(f)
----
-"[1]"
+"1"
statement ok
b:= json.new("{\"f1\":1,\"f2\":2}")
@@ -29,7 +29,7 @@ f:= json.filter(b,"f2")
query T rowsort
io.print(f)
----
-"[2]"
+"2"
statement ok
f:= json.filter(b,"f1,f2")
@@ -48,7 +48,7 @@ f:= json.filter(b,"f1[0]")
query T rowsort
io.print(f)
----
-"[1]"
+"3"
statement ok
f:= json.filter(b,"f1[1]")
@@ -56,7 +56,7 @@ f:= json.filter(b,"f1[1]")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
f:= json.filter(b,"f1[2]")
@@ -91,7 +91,7 @@ f:= json.filter(b,"f1")
query T rowsort
io.print(f)
----
-"[{\"f12\":3}]"
+"{\"f12\":3}"
statement ok
f:= json.filter(b,"f1.f12")
@@ -99,7 +99,7 @@ f:= json.filter(b,"f1.f12")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
f:= json.filter(b,"$.f1.f12")
@@ -107,7 +107,7 @@ f:= json.filter(b,"$.f1.f12")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
f:= json.filter(b,"..f12")
@@ -126,7 +126,7 @@ f:= json.filter(b,"[0]")
query T rowsort
io.print(f)
----
-"[1]"
+"1"
statement ok
f:= json.filter(b,"[1]")
@@ -134,7 +134,7 @@ f:= json.filter(b,"[1]")
query T rowsort
io.print(f)
----
-"[\"f2\"]"
+"\"f2\""
statement ok
f:= json.filter(b,"[2]")
@@ -142,7 +142,7 @@ f:= json.filter(b,"[2]")
query T rowsort
io.print(f)
----
-"[2]"
+"2"
statement ok
f:= json.filter(b,"[3]")
@@ -169,7 +169,7 @@ f:= json.filter(b,"[0]")
query T rowsort
io.print(f)
----
-"[{\"boter\":1}]"
+"{\"boter\":1}"
statement ok
f:= json.filter(b,"[0].boter")
@@ -177,7 +177,7 @@ f:= json.filter(b,"[0].boter")
query T rowsort
io.print(f)
----
-"[1]"
+"1"
statement ok
f:= json.filter(b,"[1]")
@@ -185,7 +185,7 @@ f:= json.filter(b,"[1]")
query T rowsort
io.print(f)
----
-"[{\"kaas\":2}]"
+"{\"kaas\":2}"
statement ok
f:= json.filter(b,"[1].kaas")
@@ -193,7 +193,7 @@ f:= json.filter(b,"[1].kaas")
query T rowsort
io.print(f)
----
-"[2]"
+"2"
statement ok
f:= json.filter(b,"[2]")
@@ -201,7 +201,7 @@ f:= json.filter(b,"[2]")
query T rowsort
io.print(f)
----
-"[{\"eieren\":3}]"
+"{\"eieren\":3}"
statement ok
f:= json.filter(b,"[2].eieren")
@@ -209,7 +209,7 @@ f:= json.filter(b,"[2].eieren")
query T rowsort
io.print(f)
----
-"[3]"
+"3"
statement ok
f:= json.filter(b,"[3]")
diff --git a/monetdb5/modules/atoms/Tests/json05.maltest
b/monetdb5/modules/atoms/Tests/json05.maltest
--- a/monetdb5/modules/atoms/Tests/json05.maltest
+++ b/monetdb5/modules/atoms/Tests/json05.maltest
@@ -12,7 +12,7 @@ p:= json.filter(js,"[0].book")
query T rowsort
io.print(p)
----
-"[{ \"category\": \"reference\", \"author\": \"Nigel Rees\", \"title\":
\"Sayings of the Century\", \"price\": 8.95 },{ \"category\": \"fiction\",
\"author\": \"Evelyn Waugh\", \"title\": \"Sword of Honour\", \"price\": 12.99
},{ \"category\": \"fiction\", \"author\": \"Herman Melville\", \"title\":
\"Moby Dick\", \"isbn\": \"0-553-21311-3\", \"price\": 8.99 },{ \"category\":
\"fiction\", \"author\": \"J. R. R. Tolkien\", \"title\": \"The Lord of the
Rings\", \"isbn\": \"0-395-19395-8\", \"price\": 22.99 }]"
+"{ \"category\": \"fiction\", \"author\": \"J. R. R. Tolkien\", \"title\":
\"The Lord of the Rings\", \"isbn\": \"0-395-19395-8\", \"price\": 22.99 }"
statement ok
p:= json.filter(js,"[1].pencil")
@@ -20,7 +20,7 @@ p:= json.filter(js,"[1].pencil")
query T rowsort
io.print(p)
----
-"[{ \"color\": \"red\", \"price\": 19.95 }]"
+"{ \"color\": \"red\", \"price\": 19.95 }"
statement ok
p:= json.filter(js,"..author")
@@ -44,7 +44,7 @@ p:= json.filter(js,"[0].book[0]")
query T rowsort
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
