diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
| commit | 386929d3aee738cd0e3db335fb54e95bba8f9985 (patch) | |
| tree | dd79682febb582afa1309c3b04f172d140b20aa6 /sql/mysqld.cc | |
| parent | 0823afc8bf160e03ce722c5e3cef21024b63b99a (diff) | |
| parent | c2ebb0ac882feadedd0bbca71277fd2de66aa957 (diff) | |
| download | mariadb-git-386929d3aee738cd0e3db335fb54e95bba8f9985.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 9afdfab7e89..7356d4e917e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2967,6 +2967,9 @@ int my_message_sql(uint error, const char *str, myf MyFlags) DBUG_RETURN(0); } + /* When simulating OOM, skip writing to error log to avoid mtr errors */ + DBUG_EXECUTE_IF("simulate_out_of_memory", DBUG_RETURN(0);); + if (!thd->no_warnings_for_error && !(MyFlags & ME_NO_WARNING_FOR_ERROR)) { @@ -2979,6 +2982,10 @@ int my_message_sql(uint error, const char *str, myf MyFlags) thd->no_warnings_for_error= FALSE; } } + + /* When simulating OOM, skip writing to error log to avoid mtr errors */ + DBUG_EXECUTE_IF("simulate_out_of_memory", DBUG_RETURN(0);); + if (!thd || MyFlags & ME_NOREFRESH) sql_print_error("%s: %s",my_progname,str); /* purecov: inspected */ DBUG_RETURN(0); |