diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-28 13:40:09 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-05-28 13:40:09 +0500 |
| commit | 0aa26d39aa7743162a6fe3246369b10729178eab (patch) | |
| tree | 075b2f57a985b23448475d0bc89bbe4735a61654 /client | |
| parent | 6282b4d3e4133c355e45e63e97fe5b6649133f53 (diff) | |
| parent | 1b91400ac6758e3ce28a4ee18123a5c5117c9f7e (diff) | |
| download | mariadb-git-0aa26d39aa7743162a6fe3246369b10729178eab.tar.gz | |
5.0-bugteam->5.1-bugteam merge
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))) || |