Changeset: 0f2d6c08cdc7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f2d6c08cdc7
Modified Files:
gdk/gdk_logger.c
sql/test/BugTracker-2020/Tests/All
sql/test/sysmon/Tests/All
testing/sqllogictest.py
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (29 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1150,7 +1150,12 @@ logger_readlog(logger *lg, char *filenam
return GDK_SUCCEED;
case 1:
/* if not empty, must start with correct byte order mark */
- assert(byteorder == 1234);
+ if (byteorder != 1234) {
+ TRC_CRITICAL(GDK, "incorrect byte order word in file
%s\n", filename);
+ logger_close(lg);
+ GDKdebug = dbg;
+ return GDK_FAIL;
+ }
break;
}
if ((fd = getFileNo(lg->log)) < 0 || fstat(fd, &sb) < 0) {
diff --git a/sql/test/BugTracker-2020/Tests/All
b/sql/test/BugTracker-2020/Tests/All
--- a/sql/test/BugTracker-2020/Tests/All
+++ b/sql/test/BugTracker-2020/Tests/All
@@ -40,7 +40,7 @@ savepoints_crash_mserver5_2.Bug-7021
transaction_with_unreleased_savepoint.Bug-7022
view_with_aggr_column.Bug-7023
delete-transaction-loose-inserts.Bug-7024
-revokeRoleUserLoggedIN.Bug-7026
+HAVE_PYMONETDB?revokeRoleUserLoggedIN.Bug-7026
drop-table-with-auto_increment.Bug-7030
HAVE_PYMONETDB?dbfarm-foreign-chars.Bug-7031
user-update-privs.Bug-7035
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
