Changeset: e58dc246250d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e58dc246250d
Modified Files:
gdk/gdk_calc_private.h
Branch: default
Log Message:
Merged with Jan2022 branch.
diffs (46 lines):
diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h
--- a/gdk/gdk_calc_private.h
+++ b/gdk/gdk_calc_private.h
@@ -157,7 +157,7 @@
#elif HAVE___INT128
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
MULI4_WITH_CHECK(lft, rgt, lng, dst, max, __int128, on_overflow)
-#elif defined(_MSC_VER) && defined(_M_AMD64)
+#elif defined(_MSC_VER) && defined(_M_AMD64) && !defined(__INTEL_COMPILER)
#include <intrin.h>
#pragma intrinsic(_mul128)
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
diff --git a/sql/test/Tests/load_with_offset.test
b/sql/test/Tests/load_with_offset.test
--- a/sql/test/Tests/load_with_offset.test
+++ b/sql/test/Tests/load_with_offset.test
@@ -136,7 +136,7 @@ NULL
a
b
-statement error 42000!syntax error in: "copy 9 records into my_test from stdin
using delimiters '|',E'\n' null as '' no"
+statement error 42000!
COPY 9 RECORDS INTO my_test FROM stdin USING DELIMITERS '|',E'\n' NULL as ''
NO CONSTRAINT
<COPY_INTO_DATA>
diff --git a/testing/utils.py b/testing/utils.py
--- a/testing/utils.py
+++ b/testing/utils.py
@@ -9,16 +9,14 @@ def parse_mapi_err_msg(error:str=''):
"""
err_code = None
err_msg = None
- tmp = error.split('!')
+ tmp = error.split('!', 1)
if len(tmp) > 1:
try:
err_code = tmp[0].strip()
except (ValueError, TypeError):
pass
- # reconstruct
- err_msg = ('!'.join(tmp[1:])).strip()
+ err_msg = tmp[1].strip()
elif len(tmp) == 1:
if tmp[0]:
err_msg = tmp[0].strip()
return err_code, err_msg
-
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
