summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <tim@siva.hindu.god>2005-10-28 12:13:34 +1300
committerunknown <tim@siva.hindu.god>2005-10-28 12:13:34 +1300
commitcca1114f0e769e6e51ecb2821827d5efa7f97362 (patch)
tree8f893d10664a488f2c453364a9565a43b0fc4a24 /client
parentfd0ed478d3dd5919f3d659bb9b5b915a148941d4 (diff)
downloadmariadb-git-cca1114f0e769e6e51ecb2821827d5efa7f97362.tar.gz
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.
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index bf417e73e22..441687e2e4e 100644
--- 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 &&
- my_strnncoll(charset_info,(uchar*) name,
- 9,
- (const uchar*) "delimiter", 9)))
+ !(strlen(name) >= 9 &&
+ !my_strnncoll(charset_info,
+ (uchar*) name, 9,
+ (const uchar*) "delimiter",
+ 9))))
DBUG_RETURN((COMMANDS *) 0);
if ((end=strcont(name," \t")))
{