1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.0-bugteam->5.1-bugteam merge

Browse Source
This commit is contained in:
Sergey Glukhov 2009-05-28 13:40:09 +05:00
commit 0aa26d39aa
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@ -1979,7 +1979,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
*/ */
if (strstr(name, "\\g") || (strstr(name, delimiter) && if (strstr(name, "\\g") || (strstr(name, delimiter) &&
!(strlen(name) >= 9 && !(strlen(name) >= 9 &&
!my_strnncoll(charset_info, !my_strnncoll(&my_charset_latin1,
(uchar*) name, 9, (uchar*) name, 9,
(const uchar*) "delimiter", (const uchar*) "delimiter",
9)))) 9))))
@ -2000,7 +2000,7 @@ static COMMANDS *find_command(char *name,char cmd_char)
{ {
if (commands[i].func && if (commands[i].func &&
((name && ((name &&
!my_strnncoll(charset_info,(uchar*)name,len, !my_strnncoll(&my_charset_latin1, (uchar*)name, len,
(uchar*)commands[i].name,len) && (uchar*)commands[i].name,len) &&
!commands[i].name[len] && !commands[i].name[len] &&
(!end || (end && commands[i].takes_params))) || (!end || (end && commands[i].takes_params))) ||

1
mysql-test/r/mysql.result
View File

@ -198,6 +198,7 @@ COUNT (*)
1 1
COUNT (*) COUNT (*)
1 1
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1)
End of 5.0 tests End of 5.0 tests
WARNING: --server-arg option not supported in this configuration. WARNING: --server-arg option not supported in this configuration.
Warning (Code 1286): Unknown table engine 'nonexistent' Warning (Code 1286): Unknown table engine 'nonexistent'

7
mysql-test/t/mysql.test
View File

@ -349,6 +349,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
--exec $MYSQL --ignore-spaces -e "SELECT COUNT (*)" --exec $MYSQL --ignore-spaces -e "SELECT COUNT (*)"
--exec $MYSQL -b -i -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 --echo End of 5.0 tests
# #