diff options
| author | unknown <kaa@polly.(none)> | 2007-11-05 13:30:31 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-05 13:30:31 +0300 |
| commit | 93f1df5ef7bbeded3f8def0b89d8507d269fa77f (patch) | |
| tree | af76c41ab4e1db4a92a41f0fd5077347fb5ca66b | |
| parent | 1daa54d6977e0bd201e99f10dd0daa87b31426dd (diff) | |
| download | mariadb-git-93f1df5ef7bbeded3f8def0b89d8507d269fa77f.tar.gz | |
Fixed code that parses the DELIMITER command to correctly calculate
the length of the remaining input string.
This is to fix mysqldump test failure in PB introduced by the patch
for bug #26215.
client/mysql.cc:
Fixed code that parses the DELIMITER command to correctly calculate
the length of the remaining input string.
| -rw-r--r-- | client/mysql.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 2c6d0df2274..a8d88bec274 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1347,10 +1347,9 @@ static bool add_line(String &buffer,char *line,char *in_string, } } else if (!*ml_comment && !*in_string && - (out - line) >= 9 && - !my_strnncoll(charset_info, (uchar*) pos, 9, - (const uchar*) "delimiter", 9) && - my_isspace(charset_info, pos[9])) + strlen(pos) >= 10 && + !my_strnncoll(charset_info, (uchar*) pos, 10, + (const uchar*) "delimiter ", 10)) { // Flush previously accepted characters if (out != line) |