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

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

Merge polly.(none):/home/kaa/src/opt/bug26215/my50-bug26215
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
02b913ad · kaa@polly.(none) · fa462599 · 910003b5 · 02b913ad
Commit 02b913ad authored Nov 05, 2007 by kaa@polly.(none)
Show 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
@@ -1352,10 +1352,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)