MonetDB: Oct2020 - Merge with Jun2020 branch.

[Sjoerd Mullender]

Changeset: 42963de663cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/42963de663cb
Modified Files:
        gdk/gdk_logger.c
Branch: Oct2020
Log Message:

Merge with Jun2020 branch.


diffs (25 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1179,6 +1179,12 @@ logger_readlog(logger *lg, char *filenam
                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;
@@ -1317,8 +1323,6 @@ logger_readlog(logger *lg, char *filenam
                        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