Changeset: a0e36e93f27d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a0e36e93f27d
Modified Files:
gdk/gdk_logger.c
gdk/gdk_project.c
sql/test/BugTracker-2021/Tests/All
Branch: Jul2021
Log Message:
Merge with Oct2020 branch.
diffs (24 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -776,7 +776,7 @@ BATproject2(BAT *restrict l, BAT *restri
/* handle string trick */
if (stringtrick) {
assert(r1i.vh);
- if (r1->batRestricted == BAT_READ) {
+ if (r1->batRestricted == BAT_READ || VIEWvtparent(r1)) {
/* really share string heap */
assert(r1i.vh->parentid > 0);
BBPshare(r1i.vh->parentid);
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
@@ -24,7 +24,7 @@ rollup-distinct-count.Bug-7146
sum-union.Bug-7147
distinct-union.Bug-7148
HAVE_LIBPY3?python-aggregates-empty.Bug-7158
-remote-join-idxs.Bug-7165
+HAVE_PYMONETDB?remote-join-idxs.Bug-7165
shutdown-force.Bug-7167
merge-table-join.Bug-7172
truncate-restart.Bug-7173
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
