From: Date: November 11 2007 10:30pm
Subject: bk commit into 5.1 tree (mattiasj:1.2612) BUG#30695
List-Archive: http://lists.mysql.com/commits/37546
X-Bug: 30695
Message-Id: <20071111213007.CCACE50AABD@mattiasj-laptop>

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj. When mattiasj 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-11 22:30:01+01:00, mattiasj@mattiasj-laptop.(none) +1 -0
  Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
      causes the Server to crash.
  
  Post-pushbuild fix
  
  Pushbuild genereted valgrind warnings.
  
  Changed function to safer variant.

  sql/sql_partition.cc@stripped, 2007-11-11 22:29:56+01:00, mattiasj@mattiasj-laptop.(none) +1 -1
    Bug#30695: An apostrophe ' in the comment of the ADD PARTITION
        causes the Server to crash.
    
    Fix for valgrind warning in pushbuild.
    String.c_prt fcn is not as safe as comment says.
    (gives valgrind errors in this case)

diff -Nrup a/sql/sql_partition.cc b/sql/sql_partition.cc
--- a/sql/sql_partition.cc	2007-10-23 22:12:57 +02:00
+++ b/sql/sql_partition.cc	2007-11-11 22:29:56 +01:00
@@ -1866,7 +1866,7 @@ static int add_quoted_string(File fptr, 
   String escapedstr;
   int err= add_string(fptr, "'");
   err+= append_escaped(&escapedstr, &orgstr);
-  err+= add_string(fptr, escapedstr.c_ptr());
+  err+= add_string(fptr, escapedstr.c_ptr_safe());
   return err + add_string(fptr, "'");
 }