database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge trunk-bugfixing -> trunk-runtime

Browse Source
This commit is contained in:
Konstantin Osipov
2010-06-17 17:31:51 +04:00
parent 91a7b14705 45c7bf3c54
commit cc6dabba37
388 changed files with 6327 additions and 11537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.cc
View File

@ -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);
}