merge

c973948f · unknown · 1752d848 · cca1114f · c973948f
Commit c973948f authored Nov 02, 2005 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

client/mysql.cc client/mysql.cc +5 -4

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1133,10 +1133,11 @@ static COMMANDS *find_command(char *name,char cmd_char)
      parsing the row and calling find_command()
    */
    if (strstr(name, "\\g") || (strstr(name, delimiter) &&
-                                strlen(name) >= 9 &&
+                                !(strlen(name) >= 9 &&
-                                my_strnncoll(charset_info,(uchar*) name,
+                                  !my_strnncoll(charset_info,
-                                             9,
+                                                (uchar*) name, 9,
-                                             (const uchar*) "delimiter", 9)))
+                                                (const uchar*) "delimiter",
+                                                9))))
      DBUG_RETURN((COMMANDS *) 0);
    if ((end=strcont(name," \t")))
    {