1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

Browse Source 
into  dipika.(none):/opt/local/work/mysql-5.1-runtime
This commit is contained in:
unknown 2008-02-08 15:54:21 +03:00
commit d6391bec22
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log.cc
View File

@ -501,11 +501,13 @@ bool Log_to_csv_event_handler::
bool result= TRUE; bool result= TRUE;
bool need_close= FALSE; bool need_close= FALSE;
bool need_rnd_end= FALSE; bool need_rnd_end= FALSE;
Silence_log_table_errors error_handler;
Open_tables_state open_tables_backup; Open_tables_state open_tables_backup;
CHARSET_INFO *client_cs= thd->variables.character_set_client; CHARSET_INFO *client_cs= thd->variables.character_set_client;
bool save_time_zone_used; bool save_time_zone_used;
DBUG_ENTER("Log_to_csv_event_handler::log_slow"); DBUG_ENTER("Log_to_csv_event_handler::log_slow");
thd->push_internal_handler(& error_handler);
/* /*
CSV uses TIME_to_timestamp() internally if table needs to be repaired CSV uses TIME_to_timestamp() internally if table needs to be repaired
which will set thd->time_zone_used which will set thd->time_zone_used
@ -635,8 +637,11 @@ bool Log_to_csv_event_handler::
result= FALSE; result= FALSE;
err: err:
thd->pop_internal_handler();
if (result) if (result)
sql_print_error("Failed to write to mysql.slow_log"); sql_print_error("Failed to write to mysql.slow_log: %s",
error_handler.message());
if (need_rnd_end) if (need_rnd_end)
{ {