Changeset: 2e375150b8cf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e375150b8cf
Modified Files:
gdk/gdk_logger.c
sql/storage/store.c
Branch: default
Log Message:
fixed crash in logger (don't unfix the passed dsnapshots bat)
fixed crash in merge table, tables - tables change set should never destroy
table structures
diffs (39 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2095,7 +2095,6 @@ bm_tids(BAT *b, BAT *d)
logbat_destroy(tids);
tids = BATmirror(BATmark(diff, 0));
logbat_destroy(diff);
- logbat_destroy(d);
}
return tids;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -601,7 +601,7 @@ load_table(sql_trans *tr, sql_schema *s,
cs_new(&t->idxs, tr->sa, (fdestroy) &idx_destroy);
cs_new(&t->keys, tr->sa, (fdestroy) &key_destroy);
cs_new(&t->triggers, tr->sa, (fdestroy) &trigger_destroy);
- cs_new(&t->tables, tr->sa, (fdestroy) &table_destroy);
+ cs_new(&t->tables, tr->sa, (fdestroy) NULL);
if (isTable(t)) {
if (store_funcs.create_del(tr, t) != LOG_OK) {
@@ -1160,6 +1160,7 @@ create_sql_table_with_id(sql_allocator *
cs_new(&t->idxs, sa, (fdestroy) &idx_destroy);
cs_new(&t->keys, sa, (fdestroy) &key_destroy);
cs_new(&t->triggers, sa, (fdestroy) &trigger_destroy);
+ cs_new(&t->tables, sa, (fdestroy) NULL);
t->pkey = NULL;
t->sz = COLSIZE;
t->cleared = 0;
@@ -2119,6 +2120,7 @@ table_dup(sql_trans *tr, int flag, sql_t
cs_new(&t->keys, sa, (fdestroy) &key_destroy);
cs_new(&t->idxs, sa, (fdestroy) &idx_destroy);
cs_new(&t->triggers, sa, (fdestroy) &trigger_destroy);
+ cs_new(&t->tables, sa, (fdestroy) NULL);
t->pkey = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
