diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
| commit | eae3b4fe762965789badce7b2d6aa51b7f0c317a (patch) | |
| tree | bad36a3866fc1f57ed09d6de5a590fa2e12bacfe /sql/sql_class.cc | |
| parent | 6d38a625c158cb56b33d14496f353652d61f0f2d (diff) | |
| parent | b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e (diff) | |
| download | mariadb-git-eae3b4fe762965789badce7b2d6aa51b7f0c317a.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict mysys/safemalloc.c
conflict sql/mysqld.cc
conflict sql/sp.cc
conflict sql/sql_lex.cc
conflict sql/sql_lex.h
conflict sql/sql_parse.cc
conflict sql/sql_prepare.cc
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index ac092756a74..8c147421363 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -878,6 +878,9 @@ THD::raise_condition_no_handler(uint sql_errno, if (no_warnings_for_error && (level == MYSQL_ERROR::WARN_LEVEL_ERROR)) DBUG_RETURN(NULL); + /* When simulating OOM, skip writing to error log to avoid mtr errors */ + DBUG_EXECUTE_IF("simulate_out_of_memory", DBUG_RETURN(NULL);); + cond= warning_info->push_warning(this, sql_errno, sqlstate, level, msg); DBUG_RETURN(cond); } |