diff options
author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 16:00:47 +0200 |
---|---|---|
committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-29 16:00:47 +0200 |
commit | 300a8721fa0436e0558ab516956a90acd3cda622 (patch) | |
tree | 4e9ce667a1b14bf9610672bb5f604bb5f5becbab /sql/thr_malloc.cc | |
parent | 477ada0aaa515fe95db90fe38b6cfe0030fdf9ae (diff) | |
parent | 67771508836edda4bad393f1a00d89cd419e3814 (diff) | |
download | mariadb-git-300a8721fa0436e0558ab516956a90acd3cda622.tar.gz |
Merge from 5.0
Diffstat (limited to 'sql/thr_malloc.cc')
-rw-r--r-- | sql/thr_malloc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 6bf43b51df0..0764fe8be33 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) |