summaryrefslogtreecommitdiff
path: root/sql/thr_malloc.cc
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-08-21 03:00:52 +0300
committermonty@donna.mysql.com <>2000-08-21 03:00:52 +0300
commitaa3580924bb1a036a5b4ce7c6f4c930499eb09e2 (patch)
treef46edbbf41f400440bde25519820b29885305b1b /sql/thr_malloc.cc
parent86f4dbe20e850a6161d69b7407838c28a8bf93f9 (diff)
downloadmariadb-git-aa3580924bb1a036a5b4ce7c6f4c930499eb09e2.tar.gz
RENAME TABLE table_name TO new_table_name ; Faster Alloc
Small bug fixes
Diffstat (limited to 'sql/thr_malloc.cc')
-rw-r--r--sql/thr_malloc.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc
index 8cf4f937546..9273b3eb5a5 100644
--- a/sql/thr_malloc.cc
+++ b/sql/thr_malloc.cc
@@ -23,6 +23,7 @@ extern "C" {
void sql_alloc_error_handler(void)
{
current_thd->fatal_error=1; /* purecov: inspected */
+ sql_print_error(ER(ER_OUT_OF_RESOURCES));
}
}
@@ -37,10 +38,6 @@ gptr sql_alloc(uint Size)
{
MEM_ROOT *root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC);
char *ptr= (char*) alloc_root(root,Size);
- if (!ptr)
- {
- sql_print_error(ER(ER_OUT_OF_RESOURCES));
- }
return ptr;
}