Changeset: 903e58fcc7aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/903e58fcc7aa
Modified Files:
sql/server/rel_optimizer.c
Branch: properties
Log Message:
Merged with default
diffs (85 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -763,3 +763,4 @@ cab90a348501b045e19cee5cebcc44f3800bd0a8
5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -189,6 +189,9 @@ fi
file=ChangeLog.$RANDOM
+# make sure we get the correct day and month names
+export LC_ALL=en_US.utf-8
+
case "$CL" in
*/*)
cd "${CL%/*}"
diff --git a/sql/ChangeLog b/sql/ChangeLog
--- a/sql/ChangeLog
+++ b/sql/ChangeLog
@@ -1,7 +1,7 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* do apr 21 2022 Nuno Faria <nunofpfa...@gmail.com>
+* Thu Apr 21 2022 Nuno Faria <nunofpfa...@gmail.com>
- Added the UNLOGGED TABLE feature.
* Fri Feb 4 2022 Sjoerd Mullender <sjo...@acm.org>
diff --git a/sql/ChangeLog.Jan2022 b/sql/ChangeLog.Jan2022
--- a/sql/ChangeLog.Jan2022
+++ b/sql/ChangeLog.Jan2022
@@ -1,6 +1,12 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Apr 25 2022 Sjoerd Mullender <sjo...@acm.org>
+- GLOBAL TEMPORARY tables are now treated like LOCAL TEMPORARY tables
+ as far as the table content is concerned. The schema information
+ stays global. This fixes an issue with concurrent access and cleanup
+ of stale data.
+
* Thu Apr 14 2022 Sjoerd Mullender <sjo...@acm.org>
- The NO CONSTRAINT option of the COPY INTO query has been removed.
It didn't work and it was never a good idea anyway.
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -89,7 +89,7 @@ merge_table_prune_and_unionize(visitor *
return sql_error(v->sql, 02, SQLSTATE(42000) "The %s
'%s.%s' should have at least one table associated",
TABLE_TYPE_DESCRIPTION(pt->type, pt->properties), pt->s->base.name,
pt->base.name);
/* Do not include empty partitions */
- if (isTable(pt) && pt->access == TABLE_READONLY &&
!store->storage_api.count_col(v->sql->session->tr,
ol_first_node(pt->columns)->data, 0))
+ if (isTable(pt) && pt->access == TABLE_READONLY &&
!store->storage_api.count_col(v->sql->session->tr,
ol_first_node(pt->columns)->data, 10)) /* count active rows only */
continue;
if (!table_privs(v->sql, pt, PRIV_SELECT)) /* Test for
privileges */
diff --git a/sql/test/BugTracker-2021/Tests/All
b/sql/test/BugTracker-2021/Tests/All
--- a/sql/test/BugTracker-2021/Tests/All
+++ b/sql/test/BugTracker-2021/Tests/All
@@ -7,7 +7,7 @@ union-groupby.Bug-7108
merge-stmt.wrong-error.Bug-7109
remote-table-groupby.Bug-7110
conditional-execution-round.Bug-7125
-lowercase-cryllic.Bug-7126
+NOT_WIN32?lowercase-cryllic.Bug-7126
unnest-union.Bug-7127
subquery-missing.Bug-7128
batcalc-between-undefined.Bug-7129
diff --git a/sql/test/mapi/Tests/All b/sql/test/mapi/Tests/All
--- a/sql/test/mapi/Tests/All
+++ b/sql/test/mapi/Tests/All
@@ -4,7 +4,7 @@ sample4
smack00
smack01
python3_dbapi
-NOT_WIN32?utf8test
+utf8test
HAVE_HGE?mal_int128
HAVE_HGE?sql_int128
HAVE_HGE?python3_int128
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
