Changeset: 660c417bdec5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/660c417bdec5 Modified Files: sql/storage/bat/bat_storage.c Branch: default Log Message:
merged with jan2022 diffs (61 lines): diff --git a/MacOSX/summary.rtf b/MacOSX/summary.rtf --- a/MacOSX/summary.rtf +++ b/MacOSX/summary.rtf @@ -7,4 +7,4 @@ \f0\b\fs24 \cf0 Installation was successful. \b0 \ \ -You can now start MonetDB from your Terminal. For a tutorial how to operate and use MonetDB, please visit {\field{\*\fldinst{HYPERLINK "https://www.monetdb.org/Documentation/UserGuide/Tutorial"}}{\fldrslt https://www.monetdb.org/documentation/user-guide/tutorials/voc-tutorial/}}.} +You can now start MonetDB from your Terminal. For a tutorial how to operate and use MonetDB, please visit {\field{\*\fldinst{HYPERLINK "https://www.monetdb.org/documentation/user-guide/tutorials/voc-tutorial/"}}{\fldrslt https://www.monetdb.org/documentation/user-guide/tutorials/voc-tutorial/}}.} diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c --- a/gdk/gdk_logger.c +++ b/gdk/gdk_logger.c @@ -605,7 +605,7 @@ la_bat_update_count(logger *lg, log_id i HASHloop_int(cni, cni.b->thash, p, &id) { lng lid = *(lng *) Tloc(lg->catalog_lid, p); - if (lid != lng_nil && lid <= lg->saved_tid) + if (lid != lng_nil && lid <= lg->tid) break; cp = p; } @@ -620,7 +620,6 @@ la_bat_update_count(logger *lg, log_id i MT_rwlock_rdunlock(&cni.b->thashlock); } return GDK_SUCCEED; - } static gdk_return diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c --- a/sql/storage/bat/bat_storage.c +++ b/sql/storage/bat/bat_storage.c @@ -4578,7 +4578,7 @@ col_compress(sql_trans *tr, sql_column * temp_destroy(d->cs.ebid); d->cs.ebid = temp_create(u); } - return 0; + return LOG_OK; } diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -6105,7 +6105,6 @@ sql_trans_alter_default(sql_trans *tr, s if ((res = new_column(tr, col, &dup))) return res; _DELETE(dup->def); - dup->def = NULL; if (val) dup->def = SA_STRDUP(tr->sa, val); if ((res = store_reset_sql_functions(tr, col->t->base.id))) /* reset sql functions depending on the table */ @@ -6136,7 +6135,7 @@ sql_trans_alter_storage(sql_trans *tr, s if ((res = new_column(tr, col, &dup))) return res; - dup->storage_type = NULL; + _DELETE(dup->storage_type); if (storage) dup->storage_type = SA_STRDUP(tr->sa, storage); if (!isNew(col) && isGlobal(col->t) && !isGlobalTemp(col->t) && (res = sql_trans_add_dependency(tr, col->t->base.id, dml))) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list