Changeset: 65017aaa1662 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65017aaa1662
Modified Files:
sql/backends/monet5/sql_time.c
sql/test/SQLancer/Tests/sqlancer04.stable.err
Branch: Oct2020
Log Message:
English
diffs (33 lines):
diff --git a/sql/backends/monet5/sql_time.c b/sql/backends/monet5/sql_time.c
--- a/sql/backends/monet5/sql_time.c
+++ b/sql/backends/monet5/sql_time.c
@@ -124,7 +124,7 @@ lng shift, lng divider, lng multiplier
char *str_val = NULL;
if (BATatoms[TYPE_lng].atomToStr(&str_val, &len, &next, false)
< 0)
return createException(SQL,
"batcalc.second_interval_2_daytime", SQLSTATE(HY013) MAL_MALLOC_FAIL);
- msg = createException(SQL, "batcalc.second_interval_2_daytime",
SQLSTATE(22003) "Overflow in convertion of second interval '%s' to time",
str_val);
+ msg = createException(SQL, "batcalc.second_interval_2_daytime",
SQLSTATE(22003) "Overflow in conversion of second interval '%s' to time",
str_val);
GDKfree(str_val);
return msg;
}
@@ -1052,7 +1052,7 @@ bailout:
msg = createException(SQL, "batcalc."
FUNC_NAME, SQLSTATE(HY013) MAL_MALLOC_FAIL); \
goto bailout; \
} \
- msg = createException(SQL, "batcalc." FUNC_NAME,
SQLSTATE(22003) "Overflow in convertion of %s to " FUNC_NAME, str_val); \
+ msg = createException(SQL, "batcalc." FUNC_NAME,
SQLSTATE(22003) "Overflow in conversion of %s to " FUNC_NAME, str_val); \
GDKfree(str_val); \
goto bailout; \
} \
diff --git a/sql/test/SQLancer/Tests/sqlancer04.stable.err
b/sql/test/SQLancer/Tests/sqlancer04.stable.err
--- a/sql/test/SQLancer/Tests/sqlancer04.stable.err
+++ b/sql/test/SQLancer/Tests/sqlancer04.stable.err
@@ -61,7 +61,7 @@ ERROR = !value too long for type (var)ch
CODE = 22001
MAPI = (monetdb) /var/tmp/mtest-878466/.s.monetdb.33759
QUERY = select interval '-1680612084' second from t3 natural join (select
t4.c0, (cast(r'*' as boolean)) = false from t2, t0, t4) as sub0 group by t3.c0;
-ERROR = !Overflow in convertion of second interval '29578044000' to time
+ERROR = !Overflow in conversion of second interval '29578044000' to time
CODE = 22003
# 09:44:50 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
