Commit 68eb9b1a authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-16220 Do not pass UTF8 to mysql in command line parameters, on Windows

Moved parts of mysql.test to mysql_not_windows.test
parent 0496bbc1
...@@ -538,8 +538,6 @@ a ...@@ -538,8 +538,6 @@ a
# #
# End of 10.1 tests # End of 10.1 tests
# #
ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81' ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81'
set GLOBAL sql_mode=default; set GLOBAL sql_mode=default;
......
...@@ -9,3 +9,5 @@ End of tests ...@@ -9,3 +9,5 @@ End of tests
2 2
X X
3 3
ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
...@@ -638,10 +638,7 @@ EOF ...@@ -638,10 +638,7 @@ EOF
--echo # End of 10.1 tests --echo # End of 10.1 tests
--echo # --echo #
--error 1
--exec $MYSQL --default-character-set=utf8 -e "select 1" "test😁 " 2>&1
--error 1
--exec $MYSQL --default-character-set=binary -e "select 1" "test😁 " 2>&1
--write_file $MYSQLTEST_VARDIR/tmp/mdev-6572.sql --write_file $MYSQLTEST_VARDIR/tmp/mdev-6572.sql
SET NAMES utf8; SET NAMES utf8;
USE test😁 ; USE test😁 ;
......
...@@ -22,3 +22,10 @@ exec $MYSQL test -e "select ...@@ -22,3 +22,10 @@ exec $MYSQL test -e "select
let $query = select 3 let $query = select 3
as X; as X;
exec $MYSQL test -e "$query"; exec $MYSQL test -e "$query";
# Not ran on Windows, since non-ASCII does not work on command line.
# (MDEV-16220)
--error 1
--exec $MYSQL --default-character-set=utf8 -e "select 1" "test😁 " 2>&1
--error 1
--exec $MYSQL --default-character-set=binary -e "select 1" "test😁 " 2>&1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment