diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-05-29 18:08:16 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-05-29 18:08:16 +0400 |
| commit | 41e9d66ed0e9ed4d03c697317ec747350b83a1a4 (patch) | |
| tree | ae606500a48b3287dca2ea097c462ebee0d84f8e /client | |
| parent | 850aed6ea73a75293c60796872e1b019e5727a49 (diff) | |
| parent | 8257435fd7590d5bf9047b3467e27511101c7755 (diff) | |
| download | mariadb-git-41e9d66ed0e9ed4d03c697317ec747350b83a1a4.tar.gz | |
Automerge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 2 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))) || |