From 47bed4d45d517b6bfe4bc016ea76a2ddeb86226f Mon Sep 17 00:00:00 2001
From: unknown <bar@mysql.com/bar.myoffice.izhnet.ru>
Date: Wed, 24 Oct 2007 12:08:33 +0500
Subject: [PATCH] Bug#31081 server crash in regexp function Additional fix for
 valgrind warning

---
 sql/item_cmpfunc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 51b3e8cda6b..59e11b81c17 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -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)