Commit cca1114f authored by unknown's avatar unknown

BUG#14358: in mysql.cc, don't neglect to strip delimiter off lines < 9 characters long.


client/mysql.cc:
  BUG#14358: don't neglect to strip delimiter off lines < 9 characters long.
parent fd0ed478
...@@ -1133,10 +1133,11 @@ static COMMANDS *find_command(char *name,char cmd_char) ...@@ -1133,10 +1133,11 @@ static COMMANDS *find_command(char *name,char cmd_char)
parsing the row and calling find_command() parsing the row and calling find_command()
*/ */
if (strstr(name, "\\g") || (strstr(name, delimiter) && 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); DBUG_RETURN((COMMANDS *) 0);
if ((end=strcont(name," \t"))) if ((end=strcont(name," \t")))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment