MonetDB: Jan2022 - Merge with Jul2021 branch.

[Sjoerd Mullender]

Changeset: 3b4f9c7df9bb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3b4f9c7df9bb
Modified Files:
        gdk/gdk_logger.c
        testing/Mtest.py.in
        testing/process.py
Branch: Jan2022
Log Message:

Merge with Jul2021 branch.


diffs (35 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2342,7 +2342,7 @@ logger_flush(logger *lg, ulng ts)
 lng
 logger_changes(logger *lg)
 {
-       return (lg->id - lg->saved_id - 1);
+       return LOG_DISABLED(lg) ? 0 : (lg->id - lg->saved_id - 1);
 }
 
 int
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3467,6 +3467,7 @@ def main(argv) :
             mserver5_opts.extend(['--set', a])
             if a == 'sql_debug=128':
                 CONDITIONALS['NOWAL'] = True
+                os.environ['NOWAL'] = 'True'
     if opts.loadmodule:
         for a in opts.loadmodule:
             mserver5_opts.extend(['--loadmodule', a])
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -370,6 +370,8 @@ class server(Popen):
             cmd = ['mserver5',
                    '--set', ipv6 and 'mapi_listenaddr=all' or 
'mapi_listenaddr=0.0.0.0',
                    '--set', 'gdk_nr_threads=1']
+        if os.getenv('NOWAL'):
+            cmd.extend(['--set', 'sql_debug=128'])
         if verbose:
             sys.stdout.write('Default server: ' + ' '.join(cmd +  args) + '\n')
         if notrace and '--trace' in cmd:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org