Many files:

  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h


client/mysqltest.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
os2/MySQL-Source.icc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/Makefile.am:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/debug.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/engine.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/main.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regcomp.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regerror.ih:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/my_regex.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regexec.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/regfree.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
regex/reginit.c:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/item_cmpfunc.h:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
sql/mysqld.cc:
  Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.

1 files changed, 16 insertions, 16 deletions

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 74eed7fa41a..f3ba276ec04 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2556,14 +2556,14 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
       return 0;
     }
     int error;
-    if ((error= regcomp(&preg,res->c_ptr(),
-                        ((cmp_collation.collation->state &
-                          (MY_CS_BINSORT | MY_CS_CSSORT)) ?
-                         REG_EXTENDED | REG_NOSUB :
-                         REG_EXTENDED | REG_NOSUB | REG_ICASE),
-                        cmp_collation.collation)))
+    if ((error= my_regcomp(&preg,res->c_ptr(),
+                           ((cmp_collation.collation->state &
+                             (MY_CS_BINSORT | MY_CS_CSSORT)) ?
+                            REG_EXTENDED | REG_NOSUB :
+                            REG_EXTENDED | REG_NOSUB | REG_ICASE),
+                           cmp_collation.collation)))
     {
-      (void) regerror(error,&preg,buff,sizeof(buff));
+      (void) my_regerror(error,&preg,buff,sizeof(buff));
       my_printf_error(ER_REGEXP_ERROR,ER(ER_REGEXP_ERROR),MYF(0),buff);
       return 1;
     }
@@ -2605,15 +2605,15 @@ longlong Item_func_regex::val_int()
       prev_regexp.copy(*res2);
       if (regex_compiled)
       {
-	regfree(&preg);
+	my_regfree(&preg);
 	regex_compiled=0;
       }
-      if (regcomp(&preg,res2->c_ptr(),
-                  ((cmp_collation.collation->state &
-                    (MY_CS_BINSORT | MY_CS_CSSORT)) ?
-                   REG_EXTENDED | REG_NOSUB :
-                   REG_EXTENDED | REG_NOSUB | REG_ICASE),
-                   cmp_collation.collation))
+      if (my_regcomp(&preg,res2->c_ptr(),
+                     ((cmp_collation.collation->state &
+                       (MY_CS_BINSORT | MY_CS_CSSORT)) ?
+                      REG_EXTENDED | REG_NOSUB :
+                      REG_EXTENDED | REG_NOSUB | REG_ICASE),
+                     cmp_collation.collation))
       {
 	null_value=1;
 	return 0;
@@ -2622,7 +2622,7 @@ longlong Item_func_regex::val_int()
     }
   }
   null_value=0;
-  return regexec(&preg,res->c_ptr(),0,(regmatch_t*) 0,0) ? 0 : 1;
+  return my_regexec(&preg,res->c_ptr(),0,(my_regmatch_t*) 0,0) ? 0 : 1;
 }
 
 
@@ -2632,7 +2632,7 @@ void Item_func_regex::cleanup()
   Item_bool_func::cleanup();
   if (regex_compiled)
   {
-    regfree(&preg);
+    my_regfree(&preg);
     regex_compiled=0;
   }
   DBUG_VOID_RETURN;