diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
| commit | cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1 (patch) | |
| tree | 9413ba739bc0dbf1e647293756a3503f17dcde07 /sql/thr_malloc.cc | |
| parent | 91a7b147056a228804f81726127035aa305702ff (diff) | |
| parent | 45c7bf3c54fa852b312773688fdce15bffe49abf (diff) | |
| download | mariadb-git-cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1.tar.gz | |
Merge trunk-bugfixing -> trunk-runtime
Diffstat (limited to 'sql/thr_malloc.cc')
| -rw-r--r-- | sql/thr_malloc.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 7696f28081d..79a6fd79d4c 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -24,8 +24,6 @@ extern "C" { void sql_alloc_error_handler(void) { - sql_print_error("%s", ER(ER_OUT_OF_RESOURCES)); - THD *thd= current_thd; if (thd) { @@ -53,6 +51,12 @@ extern "C" { NULL); } } + + /* Skip writing to the error log to avoid mtr complaints */ + DBUG_EXECUTE_IF("simulate_out_of_memory", return;); + + sql_print_error("%s", ER(ER_OUT_OF_RESOURCES)); + } } |