Changeset: 197285790331 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/197285790331
Modified Files:
gdk/gdk_logger.c
sql/storage/store.c
Branch: Jun2023
Log Message:
merged with sep2022
diffs (26 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -658,8 +658,8 @@ la_bat_updates(logger *lg, logaction *la
if (bid < 0)
return GDK_FAIL;
if (!bid) {
- GDKerror("la_bat_updates failed to find bid for object %d\n",
la->cid);
- return GDK_FAIL;
+ /* object already gone, nothing needed */
+ return GDK_SUCCEED;
}
if (!lg->flushing) {
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -5976,8 +5976,6 @@ sql_trans_drop_table(sql_trans *tr, sql_
if ((res = sys_drop_table(tr, gt?gt:t, drop_action)))
return res;
- t->base.deleted = 1;
-
if (gt && (res = os_del(s->tables, tr, gt->base.name,
dup_base(>->base))))
return res;
if (t != gt && (res =os_del(tr->localtmps, tr, t->base.name,
dup_base(&t->base))))
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
