diff options
| -rw-r--r-- | client/mysql.cc | 4 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 860fc3a5f6e..5f360b83dc1 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1979,7 +1979,7 @@ static COMMANDS *find_command(char *name,char cmd_char) */ if (strstr(name, "\\g") || (strstr(name, delimiter) && !(strlen(name) >= 9 && - !my_strnncoll(charset_info, + !my_strnncoll(&my_charset_latin1, (uchar*) name, 9, (const uchar*) "delimiter", 9)))) @@ -2000,7 +2000,7 @@ static COMMANDS *find_command(char *name,char cmd_char) { if (commands[i].func && ((name && - !my_strnncoll(charset_info,(uchar*)name,len, + !my_strnncoll(&my_charset_latin1, (uchar*)name, len, (uchar*)commands[i].name,len) && !commands[i].name[len] && (!end || (end && commands[i].takes_params))) || diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index a04eb1ca1aa..6313f1bd6a8 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -198,6 +198,7 @@ COUNT (*) 1 COUNT (*) 1 +ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1) End of 5.0 tests WARNING: --server-arg option not supported in this configuration. Warning (Code 1286): Unknown table engine 'nonexistent' diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index ba5cc243c01..c13e88314c0 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -349,6 +349,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql; --exec $MYSQL --ignore-spaces -e "SELECT COUNT (*)" --exec $MYSQL -b -i -e "SELECT COUNT (*)" +# +# Bug#37268 'binary' character set makes CLI-internal commands case sensitive +# +--error 1 +--exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1 +--exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1 + --echo End of 5.0 tests # |