Merge remote-tracking branch 'origin/10.1' into 10.2

5 files changed, 13 insertions, 53 deletions

diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index 6d2190772c5..52dc2ed2b0f 100644
--- a/strings/CMakeLists.txt
+++ b/strings/CMakeLists.txt
@@ -20,7 +20,7 @@ SET(STRINGS_SOURCES bchange.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c
                 ctype-latin1.c ctype-mb.c ctype-simple.c ctype-sjis.c ctype-tis620.c ctype-uca.c
                 ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c dtoa.c int2str.c
                 is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c
-                str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c 
+                str2int.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c
                 strxmov.c strxnmov.c xml.c
                 strmov_overlapp.c
 		my_strchr.c strcont.c strappend.c json_lib.c)
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 4dbb66d89c5..5e24c84056c 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -524,7 +524,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
 
   tc1= buf;
   if ((len1 + len2 +2) > (int) sizeof(buf))
-    tc1= (uchar*) my_str_malloc(len1+len2+2);
+    tc1= (uchar*) my_malloc(len1+len2+2, MYF(MY_FAE));
   tc2= tc1 + len1+1;
   memcpy((char*) tc1, (char*) s1, len1);
   tc1[len1]= 0;		/* if length(s1)> len1, need to put 'end of string' */
@@ -534,7 +534,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
   thai2sortable(tc2, len2);
   i= strcmp((char*)tc1, (char*)tc2);
   if (tc1 != buf)
-    my_str_free(tc1);
+    my_free(tc1);
   return i;
 }
 
@@ -550,7 +550,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
 
   a= buf;
   if ((a_length + b_length +2) > (int) sizeof(buf))
-    alloced= a= (uchar*) my_str_malloc(a_length+b_length+2);
+    alloced= a= (uchar*) my_malloc(a_length+b_length+2, MYF(MY_FAE));
   
   b= a + a_length+1;
   memcpy((char*) a, (char*) a0, a_length);
@@ -578,7 +578,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
 ret:
   
   if (alloced)
-    my_str_free(alloced);
+    my_free(alloced);
   return res;
 }
 
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index b2ff1e0fa2c..34ec811adac 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.c
@@ -752,14 +752,14 @@ int my_vfprintf(FILE *stream, const char* format, va_list args)
       and try again.
     */
     if (alloc)
-      (*my_str_free)(p);
+      my_free(p);
     else
       alloc= 1;
     new_len= cur_len*2;
     if (new_len < cur_len)
       return 0;                                 /* Overflow */
     cur_len= new_len;
-    p= (*my_str_malloc)(cur_len);
+    p= my_malloc(cur_len, MYF(MY_FAE));
     if (!p)
       return 0;
   }
@@ -767,7 +767,7 @@ int my_vfprintf(FILE *stream, const char* format, va_list args)
   if (fputs(p, stream) < 0)
     ret= -1;
   if (alloc)
-    (*my_str_free)(p);
+    my_free(p);
   return ret;
 }
 
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
deleted file mode 100644
index 91246603f2e..00000000000
--- a/strings/str_alloc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (c) 2005, 2006 MySQL AB
-   Copyright (c) 2009-2011, Monty Program Ab
-   Use is subject to license terms.
-   Copyright (c) 2009-2011, Monty Program Ab
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-#include "strings_def.h"
-
-static void *my_str_malloc_default(size_t size)
-{
-  void *ret= malloc(size);
-  if (!ret)
-    exit(1);
-  return ret;
-}
-
-static void my_str_free_default(void *ptr)
-{
-  free(ptr);
-}
-
-void *my_str_realloc_default(void *ptr, size_t size)
-{
-  return realloc(ptr, size);
-}
-
-void *(*my_str_malloc)(size_t)= &my_str_malloc_default;
-void (*my_str_free)(void *)= &my_str_free_default;
-void *(*my_str_realloc)(void *, size_t)= &my_str_realloc_default;
diff --git a/strings/xml.c b/strings/xml.c
index 4685a04faec..b5fed6a6760 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -17,6 +17,7 @@
 #include "strings_def.h"
 #include "m_string.h"
 #include "my_xml.h"
+#include "my_sys.h"
 
 
 #define MY_XML_UNKNOWN  'U'
@@ -231,13 +232,13 @@ static int my_xml_attr_ensure_space(MY_XML_PARSER *st, size_t len)
 
     if (!st->attr.buffer)
     {
-      st->attr.buffer= (char *) my_str_malloc(st->attr.buffer_size);
+      st->attr.buffer= (char *) my_malloc(st->attr.buffer_size, MYF(0));
       if (st->attr.buffer)
         memcpy(st->attr.buffer, st->attr.static_buffer, ofs + 1 /*term. zero */);
     }
     else
-      st->attr.buffer= (char *) my_str_realloc(st->attr.buffer,
-                                               st->attr.buffer_size);
+      st->attr.buffer= (char *) my_realloc(st->attr.buffer,
+                                           st->attr.buffer_size, MYF(0));
     st->attr.start= st->attr.buffer;
     st->attr.end= st->attr.start + ofs;
     
@@ -507,7 +508,7 @@ void my_xml_parser_free(MY_XML_PARSER *p)
 {
   if (p->attr.buffer)
   {
-    my_str_free(p->attr.buffer);
+    my_free(p->attr.buffer);
     p->attr.buffer= NULL;
   }
 }