summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 13:34:30 +0500
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-05-28 13:34:30 +0500
commit1b91400ac6758e3ce28a4ee18123a5c5117c9f7e (patch)
treebf972072d598f07cfaa42bcbc3282906d1bb2310 /client/mysql.cc
parentf1463061b281916d81e5a2838101df88bf550df2 (diff)
downloadmariadb-git-1b91400ac6758e3ce28a4ee18123a5c5117c9f7e.tar.gz
Bug#37268 'binary' character set makes CLI-internal commands case sensitive
The fix is to use case insensitive collation for mysql client command search. client/mysql.cc: The fix is to use case insensitive collation for mysql client command search. mysql-test/r/mysql.result: test result mysql-test/t/mysql.test: test case
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 89f1f28bb1b..b7d66071ca5 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1949,7 +1949,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))))
@@ -1970,7 +1970,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))) ||