From: Date: November 5 2007 11:30am
Subject: bk commit into 5.0 tree (kaa:1.2548) BUG#26215
List-Archive: http://lists.mysql.com/commits/37076
X-Bug: 26215
Message-Id: <20071105103038.321802469@polly.local>

Below is the list of changes that have just been committed into a local
5.0 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-05 13:30:31+03:00, kaa@polly.(none) +1 -0
  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@stripped, 2007-11-05 13:30:28+03:00, kaa@polly.(none) +3 -4
    Fixed code that parses the DELIMITER command to correctly calculate 
    the length of the remaining input string.

diff -Nrup a/client/mysql.cc b/client/mysql.cc
--- a/client/mysql.cc	2007-11-02 13:40:31 +03:00
+++ b/client/mysql.cc	2007-11-05 13:30:28 +03:00
@@ -1347,10 +1347,9 @@ static bool add_line(String &buffer,char
       }
     }
     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)