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

Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
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
This commit is contained in:
Alexey Kopytov
2010-06-11 17:48:24 +04:00
parent 26a0349592 e5cf56ef80
commit f84b3f5c21
18 changed files with 179 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -3113,6 +3113,10 @@ void my_message_sql(uint error, const char *str, myf MyFlags)
MYSQL_ERROR::WARN_LEVEL_ERROR,
str);
}
/* When simulating OOM, skip writing to error log to avoid mtr errors */
DBUG_EXECUTE_IF("simulate_out_of_memory", DBUG_VOID_RETURN;);
if (!thd || MyFlags & ME_NOREFRESH)
sql_print_error("%s: %s",my_progname,str); /* purecov: inspected */
DBUG_VOID_RETURN;