Changeset: f470f316d8af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f470f316d8af
Modified Files:
sql/storage/store.c
Branch: group-commit
Log Message:
Merge heads.
diffs (14 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3927,7 +3927,9 @@ sql_trans_commit(sql_trans *tr)
}
}
- if (!tr->parent && (!list_empty(tr->dependencies) ||
!list_empty(tr->depchanges))) {
+ if (!tr->parent &&
+ ATOMIC_GET(&store->nr_active) == 1 &&
+ (!list_empty(tr->dependencies) ||
!list_empty(tr->depchanges))) {
ok = transaction_check_dependencies_and_removals(tr);
if (ok != LOG_OK) {
sql_trans_rollback(tr, true);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
