MonetDB: Jul2021 - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: 585df363d560 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/585df363d560
Branch: Jul2021
Log Message:

Merge with Oct2020 branch.


diffs (24 lines):

diff --git a/sql/test/emptydb-upgrade-chain/Tests/package.py 
b/sql/test/emptydb-upgrade-chain/Tests/package.py
--- a/sql/test/emptydb-upgrade-chain/Tests/package.py
+++ b/sql/test/emptydb-upgrade-chain/Tests/package.py
@@ -37,7 +37,7 @@ if rev:
     revcomment = ' (hg id %s)' % rev
 else:
     revcomment = ''
-if hge == '16' and 'largest integer size 16' not in comment:
+if hge == '16' and b'largest integer size 16' not in comment:
     revcomment = ' with largest integer size 16' + revcomment
 z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME', 
'unknown'), revcomment)).encode('utf-8')
 
diff --git a/sql/test/testdb-upgrade-chain/Tests/package.py 
b/sql/test/testdb-upgrade-chain/Tests/package.py
--- a/sql/test/testdb-upgrade-chain/Tests/package.py
+++ b/sql/test/testdb-upgrade-chain/Tests/package.py
@@ -37,7 +37,7 @@ if rev:
     revcomment = ' (hg id %s)' % rev
 else:
     revcomment = ''
-if hge == '16' and 'largest integer size 16' not in comment:
+if hge == '16' and b'largest integer size 16' not in comment:
     revcomment = ' with largest integer size 16' + revcomment
 z.comment = comment + ('Chained on host %s%s.\n' % (os.getenv('HOSTNAME', 
'unknown'), revcomment)).encode('utf-8')
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list