Changeset: 76250bca0a42 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/76250bca0a42
Modified Files:
monetdb5/mal/mal_runtime.c
sql/server/rel_updates.c
Branch: default
Log Message:
use MERGE_LEFT flag also for updates
diffs (23 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -321,7 +321,7 @@ runtimeProfileFinish(Client cntxt, MalBl
// finished query is not found, we want to print some informational
// messages for debugging.
if (!found) {
- assert(0);
+ //assert(0);
TRC_INFO_IF(MAL_SERVER) {
TRC_INFO_ENDIF(MAL_SERVER, "runtimeProfilerFinish: stk
(%p) not found in QRYqueue", stk);
i = qtail;
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -1062,6 +1062,7 @@ update_generate_assignments(sql_query *q
reset_processed(rel_val);
}
r = rel_crossproduct(sql->sa, r, rel_val,
op_left);
+ r->flag |= MERGE_LEFT;
set_dependent(r);
set_processed(r);
if (single) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
