Commit c05d4310 authored by Sergei Golubchik's avatar Sergei Golubchik

bug: crash when sync() or close() of a log file fails on shutdown

because current_thd is NULL and ER() causes sigsegv
parent 8f499c39
...@@ -2491,14 +2491,14 @@ void MYSQL_LOG::close(uint exiting) ...@@ -2491,14 +2491,14 @@ void MYSQL_LOG::close(uint exiting)
if (mysql_file_sync(log_file.file, MYF(MY_WME)) && ! write_error) if (mysql_file_sync(log_file.file, MYF(MY_WME)) && ! write_error)
{ {
write_error= 1; write_error= 1;
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno); sql_print_error(ER_THD_OR_DEFAULT(current_thd, ER_ERROR_ON_WRITE), name, errno);
} }
if (!(exiting & LOG_CLOSE_DELAYED_CLOSE) && if (!(exiting & LOG_CLOSE_DELAYED_CLOSE) &&
mysql_file_close(log_file.file, MYF(MY_WME)) && ! write_error) mysql_file_close(log_file.file, MYF(MY_WME)) && ! write_error)
{ {
write_error= 1; write_error= 1;
sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno); sql_print_error(ER_THD_OR_DEFAULT(current_thd, ER_ERROR_ON_WRITE), name, errno);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment