Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215

into polly.(none):/home/kaa/src/opt/mysql-5.1-opt

Merge polly.(none):/home/kaa/src/opt/bug26215/my51-bug26215
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
fdaec60f · kaa@polly.(none) · ec0de2a1 · 6b828c82 · fdaec60f
Commit fdaec60f authored Nov 05, 2007 by kaa@polly.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

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

No files found.
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1370,10 +1370,9 @@ static bool add_line(String &buffer,char *line,char *in_string,
      }
    }
    else if (!*ml_comment && !*in_string &&
-             (out - line) >= 9 &&
+             strlen(pos) >= 10 &&
-             !my_strnncoll(charset_info, (uchar*) pos, 9,
+             !my_strnncoll(charset_info, (uchar*) pos, 10,
-                           (const uchar*) "delimiter", 9) &&
+                           (const uchar*) "delimiter ", 10))
-             my_isspace(charset_info, pos[9]))
    {
      // Flush previously accepted characters
      if (out != line)