Changeset: 93c85de06b98 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/93c85de06b98
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (20 lines):
diff --git a/monetdb5/optimizer/opt_commonTerms.c
b/monetdb5/optimizer/opt_commonTerms.c
--- a/monetdb5/optimizer/opt_commonTerms.c
+++ b/monetdb5/optimizer/opt_commonTerms.c
@@ -139,7 +139,7 @@ OPTcommonTermsImplementation(Client cntx
}
/* simple SQL bind operations need not be merged, they are cheap
* and/or can be duplicated eliminated elsewhere cheaper */
- if (getModuleId(p) == sqlRef && getFunctionId(p) != tidRef) {
+ if (getModuleId(p) == sqlRef && (getFunctionId(p) != tidRef &&
getFunctionId(p) != bindRef)) {
pushInstruction(mb, p);
old[i] = NULL;
continue;
diff --git a/sql/test/transactions/Tests/All b/sql/test/transactions/Tests/All
--- a/sql/test/transactions/Tests/All
+++ b/sql/test/transactions/Tests/All
@@ -7,3 +7,4 @@ mergetable-deps-crash
view-deps
chaining
truncate-insert-restart
+update_drop_crash
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
