MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: 9cf990d65081 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9cf990d65081
Modified Files:
        .hgtags
        gdk/gdk_logger.c
        gdk/gdk_logger_old.c
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (33 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -764,3 +764,4 @@ 5872f047d97c98d3a848514438b8f97fa446855d
 025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
 025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
 2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
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
@@ -1077,6 +1077,12 @@ logger_readlog(old_logger *lg, char *fil
                char tpe;
                oid id;
 
+               if (l.flag == 0) {
+                       /* end of useful content */
+                       assert(l.tid == 0);
+                       assert(l.nr == 0);
+                       break;
+               }
                t1 = time(NULL);
                if (t1 - t0 > 10) {
                        lng fpos;
@@ -1215,8 +1221,6 @@ logger_readlog(old_logger *lg, char *fil
                        else
                                err = log_read_clear(lg, tr, name, tpe, id);
                        break;
-               case 0:
-                       break;
                default:
                        err = LOG_ERR;
                }
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org