database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Bug#34417 Assertion failure in Diagnostics_area::set_error_status()

Browse Source 
The Diagnostic_area caused an assertion failure in debug mode when
the disk was full.
  
By setting the internal error handler to ignore errors caused by
underlying logging methods, the error is avoided.
This commit is contained in:
Kristofer Pettersson
2008-05-21 14:44:30 +02:00
parent e840c86e9b
commit efa65f6795
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/log.cc
View File

@@ -741,10 +741,14 @@ bool Log_to_file_event_handler::
ulonglong query_utime, ulonglong lock_utime, bool is_command,
const char *sql_text, uint sql_text_len)
{
return mysql_slow_log.write(thd, current_time, query_start_arg,
user_host, user_host_len,
query_utime, lock_utime, is_command,
sql_text, sql_text_len);
Silence_log_table_errors error_handler;
thd->push_internal_handler(&error_handler);
bool retval= mysql_slow_log.write(thd, current_time, query_start_arg,
user_host, user_host_len,
query_utime, lock_utime, is_command,
sql_text, sql_text_len);
thd->pop_internal_handler();
return retval;
}
@@ -760,9 +764,13 @@ bool Log_to_file_event_handler::
const char *sql_text, uint sql_text_len,
CHARSET_INFO *client_cs)
{
return mysql_log.write(event_time, user_host, user_host_len,
thread_id, command_type, command_type_len,
sql_text, sql_text_len);
Silence_log_table_errors error_handler;
thd->push_internal_handler(&error_handler);
bool retval= mysql_log.write(event_time, user_host, user_host_len,
thread_id, command_type, command_type_len,
sql_text, sql_text_len);
thd->pop_internal_handler();
return retval;
}