Changeset: f1fa373baaf3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f1fa373baaf3
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (33 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2511,12 +2511,14 @@ log_activate(logger *lg)
bool flush_cleanup = false;
gdk_return res = GDK_SUCCEED;
+ rotation_lock(lg);
const lng current_file_size = LOG_DISABLED(lg) ? 0 : (lng)
getfilepos(getFile(lg->current->output_log));
- if (current_file_size == -1)
+ if (current_file_size == -1) {
+ rotation_unlock(lg);
return GDK_FAIL;
-
- rotation_lock(lg);
+ }
+
if (!lg->flushnow &&
!lg->current->next &&
current_file_size > 2 &&
diff --git
a/sql/test/BugTracker-2023/Tests/insert-delete-insert-crash-7415.test
b/sql/test/BugTracker-2023/Tests/insert-delete-insert-crash-7415.test
--- a/sql/test/BugTracker-2023/Tests/insert-delete-insert-crash-7415.test
+++ b/sql/test/BugTracker-2023/Tests/insert-delete-insert-crash-7415.test
@@ -49,7 +49,7 @@ insert into t1 (select * from t1)
query I
select count(*) from t1
----
-56610
+63936
statement ok
DROP TABLE t1
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
