From: bar
Date: October 24 2007 7:08am
Subject: bk commit into 5.0 tree (bar:1.2543) BUG#31081
List-Archive: http://lists.mysql.com/commits/36229
X-Bug: 31081
Message-Id: <200710240708.l9O78bts025866@bar.myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of bar. When bar 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-10-24 12:08:33+05:00, bar@stripped +1 -0
  Bug#31081 server crash in regexp function
  Additional fix for valgrind warning

  sql/item_cmpfunc.cc@stripped, 2007-10-24 12:08:32+05:00, bar@stripped +1 -1
    Bug#31081 server crash in regexp function
    Additional fix for valgrind warning

diff -Nrup a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
--- a/sql/item_cmpfunc.cc	2007-10-05 12:15:09 +05:00
+++ b/sql/item_cmpfunc.cc	2007-10-24 12:08:32 +05:00
@@ -4255,7 +4255,7 @@ Item_func_regex::regcomp(bool send_error
     res= &conv;
   }
 
-  if ((error= my_regcomp(&preg, res->c_ptr(),
+  if ((error= my_regcomp(&preg, res->c_ptr_safe(),
                          regex_lib_flags, regex_lib_charset)))
   {
     if (send_error)