Commit 209d3d2e authored by kostja@dipika.(none)'s avatar kostja@dipika.(none)
Browse files

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

into  dipika.(none):/opt/local/work/mysql-5.1-runtime
parents 9a5e3e10 015cdcad

sql/log.cc

+6 −1
Original line number Diff line number Diff line
@@ -501,11 +501,13 @@ bool Log_to_csv_event_handler:: 
  bool result= TRUE;

  bool need_close= FALSE;

  bool need_rnd_end= FALSE;

  Silence_log_table_errors error_handler;

  Open_tables_state open_tables_backup;

  CHARSET_INFO *client_cs= thd->variables.character_set_client;

  bool save_time_zone_used;

  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

    which will set thd->time_zone_used
@@ -635,8 +637,11 @@ bool Log_to_csv_event_handler:: 
  result= FALSE;



err:

  thd->pop_internal_handler();



  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)

  {