summaryrefslogtreecommitdiff
path: root/strings/str_alloc.c
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-06-24 13:41:33 -0700
committerunknown <jimw@mysql.com>2005-06-24 13:41:33 -0700
commitf56dd2a0fa24b154aa71307e12283e43c7ff0914 (patch)
treef29e416cf6a91425d2edb7c5e7cca1dde42543f6 /strings/str_alloc.c
parentd34e2ccb3ea51811552f3e87ad68ee8673804da1 (diff)
downloadmariadb-git-f56dd2a0fa24b154aa71307e12283e43c7ff0914.tar.gz
Add my_str_malloc and _free function pointers to strings library
which will by default exit(1) if malloc() fails, but can be set to do something else by the calling program does, which mysqld does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks allocation in conf_to_src utility program. (Bug #7003) strings/conf_to_src.c: if malloc() fails, just abort VC++Files/client/mysqlclient.dsp: Add str_alloc.c VC++Files/client/mysqlclient_ia64.dsp: Add str_alloc.c VC++Files/libmysql/libmysql.dsp: Add str_alloc.c VC++Files/libmysql/libmysql_ia64.dsp: Add str_alloc.c VC++Files/libmysqld/libmysqld.dsp: Add str_alloc.c VC++Files/libmysqld/libmysqld_ia64.dsp: Add str_alloc.c VC++Files/strings/backup/strings.dsp: Add str_alloc.c VC++Files/strings/noMASM/strings.dsp: Add str_alloc.c VC++Files/strings/strings.dsp: Add str_alloc.c VC++Files/strings/strings_ia64.dsp: Add str_alloc.c include/m_string.h: Add my_str_malloc/free function pointers. libmysql/Makefile.shared: Add str_alloc.lo sql/mysqld.cc: Reassign my_str_malloc/free pointers so they use my_malloc/free strings/Makefile.am: Add str_alloc.c strings/ctype-tis620.c: Use my_str_malloc/free
Diffstat (limited to 'strings/str_alloc.c')
-rw-r--r--strings/str_alloc.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/strings/str_alloc.c b/strings/str_alloc.c
new file mode 100644
index 00000000000..158fa7e75bb
--- /dev/null
+++ b/strings/str_alloc.c
@@ -0,0 +1,34 @@
+/* Copyright (C) 2000 MySQL 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; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+#include <my_global.h>
+#include <m_string.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_malloc)(size_t)= &my_str_malloc_default;
+void (*my_str_free)(void *)= &my_str_free_default;