Changeset: 90eb914c2b2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90eb914c2b2a
Modified Files:
sql/backends/monet5/sql_scenario.c
Branch: Apr2019
Log Message:
Backport changeset 93bd9c6b2342.
This fixes bug 6740.
diffs (15 lines):
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -563,7 +563,10 @@ SQLinit(Client c)
} else if (maybeupgrade) {
SQLtrans(m);
SQLupgrades(c,m);
- msg = mvc_commit(m, 0, NULL, false);
+ /* sometimes the upgrade ends in a COMMIT,
+ * sometimes not */
+ if (m->session->tr->active)
+ msg = mvc_commit(m, 0, NULL, false);
}
maybeupgrade = 0;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
