Changeset: d538c5dad0fc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d538c5dad0fc Modified Files: sql/storage/store.c Branch: default Log Message:
the list of tables of a merge table is reset in a second phase now, solves crash when concurrently checking the catalog status (when adding parts to a merge table). diffs (12 lines): diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -3147,8 +3147,6 @@ reset_table(sql_trans *tr, sql_table *ft ft->cleared = 0; ok = reset_changeset( tr, &ft->columns, &pft->columns, &ft->base, (resetf) &reset_column, (dupfunc) &column_dup); if (ok == LOG_OK) - ok = reset_changeset( tr, &ft->tables, &pft->tables, &ft->base, (resetf) NULL, (dupfunc) &table_find); - if (ok == LOG_OK) ok = reset_changeset( tr, &ft->idxs, &pft->idxs, &ft->base, (resetf) &reset_idx, (dupfunc) &idx_dup); if (ok == LOG_OK) ok = reset_changeset( tr, &ft->keys, &pft->keys, &ft->base, (resetf) NULL, (dupfunc) &key_dup); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list