bk commit into 5.1 tree (kostja:1.2528)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-08 17:25:20+03:00, kostja@dipika.(none) +1 -0
  Don't complain about a failure to write a log message if we were
  simply killed.

  sql/log.cc@stripped, 2008-02-08 17:25:17+03:00, kostja@dipika.(none) +2 -2
    Don't complain if were simply killed.

diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc	2008-02-08 15:53:54 +03:00
+++ b/sql/log.cc	2008-02-08 17:25:17 +03:00
@@ -441,7 +441,7 @@ bool Log_to_csv_event_handler::
   result= FALSE;
 
 err:
-  if (result)
+  if (result && !thd->killed)
     sql_print_error("Failed to write to mysql.general_log: %s",
                     error_handler.message());
 
@@ -639,7 +639,7 @@ bool Log_to_csv_event_handler::
 err:
   thd->pop_internal_handler();
 
-  if (result)
+  if (result && !thd->killed)
     sql_print_error("Failed to write to mysql.slow_log: %s",
                     error_handler.message());