diff options
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/ctype_ucs.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/func_str.test | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index 13f9f5c9b6d..2875a2bfcb4 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -737,7 +737,10 @@ DROP TABLE t1; --echo # --echo # Bug#59648 my_strtoll10_mb2: Assertion `(*endptr - s) % 2 == 0' failed. --echo # +--disable_warnings +# Enable warnings when "MDEV-8844 Unreadable control characters printed as is in warnings" is fixed SELECT HEX(CHAR(COALESCE(NULL, CHAR(COUNT('%s') USING ucs2), 1, @@global.license, NULL) USING cp850)); +--enable_warnings SELECT CONVERT(QUOTE(CHAR(0xf5 using ucs2)), SIGNED); --echo End of 5.0 tests diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 14af10b0320..511f1f31736 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1549,7 +1549,12 @@ format(rpad('111111111.1', '999999999999999999999999999999999999999999'),0,'be_BY') ; -DO +# +# Originally it was DO instead of SELECT here. +# But in mysqltest --disable_prepare_warnings affects SELECT queries only +# and can't suppress prepare time warnings for DO. +# +SELECT round( concat( ( coalesce( ( @@ -1564,7 +1569,7 @@ round( ) ) ) -); +) AS r; --connection conn1 SET @@global.max_allowed_packet:= @tmp_max; |