MonetDB: Jul2021 - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: edcddf84ccf4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/edcddf84ccf4
Modified Files:
        gdk/gdk_logger.c
        gdk/gdk_logger_old.c
Branch: Jul2021
Log Message:

Merge with Oct2020 branch.


diffs (25 lines):

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