Changeset: e4b0bbc9a6d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e4b0bbc9a6d1
Modified Files:
gdk/gdk_logger.c
sql/storage/bat/bat_storage.c
Branch: Jan2022
Log Message:
merged with jul2021
diffs (41 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;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
