summaryrefslogtreecommitdiff
path: root/sql/thr_malloc.cc
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-06-29 15:17:01 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-06-29 15:17:01 +0200
commit67771508836edda4bad393f1a00d89cd419e3814 (patch)
treec3d2d1b1efe2de7e702c3d65d8b7bddccbdbd5d0 /sql/thr_malloc.cc
parent729648c4b776ec4992f6333f0c70b4b749e8d996 (diff)
downloadmariadb-git-67771508836edda4bad393f1a00d89cd419e3814.tar.gz
Merge from 5.0-bt
Diffstat (limited to 'sql/thr_malloc.cc')
-rw-r--r--sql/thr_malloc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc
index 4ebcf1c50af..3c0f96fedc1 100644
--- a/sql/thr_malloc.cc
+++ b/sql/thr_malloc.cc
@@ -21,7 +21,7 @@
extern "C" {
void sql_alloc_error_handler(void)
{
- sql_print_error(ER(ER_OUT_OF_RESOURCES));
+ sql_print_error("%s", ER(ER_OUT_OF_RESOURCES));
THD *thd=current_thd;
if (thd)