Changeset: b6abfb23ca79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b6abfb23ca79
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger_old.c
sql/storage/store.c
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (36 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -284,7 +284,7 @@ log_write_id(logger *lg, int id)
return GDK_FAIL;
}
-static int
+static log_return
log_read_id(logger *lg, log_id *id)
{
assert(!lg->inmemory);
diff --git a/gdk/gdk_logger_old.c b/gdk/gdk_logger_old.c
--- a/gdk/gdk_logger_old.c
+++ b/gdk/gdk_logger_old.c
@@ -384,7 +384,7 @@ log_read_seq(old_logger *lg, logformat *
return LOG_OK;
}
-static int
+static log_return
log_read_id(old_logger *lg, char *tpe, oid *id)
{
lng lid;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2298,7 +2298,7 @@ store_manager(sqlstore *store)
MT_lock_set(&store->flush);
for (;;) {
- int res;
+ int res = LOG_OK;
if (ATOMIC_GET(&store->nr_active) == 0 &&
(store->debug&128 || ATOMIC_GET(&store->lastactive) +
IDLE_TIME * 1000000 < (ATOMIC_BASE_TYPE) GDKusec())) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
