bk commit into 5.0 tree (holyfoot:1.2493) BUG#28839

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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, 2007-06-19 15:15:40+05:00, holyfoot@stripped +2 -0
  Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
  
  slave_sql thread calls thd->clear_error() to force error to be ignored,
  though this method didn't clear thd->killed state, what causes
  slave_sql thread to stop.
  thd->killed clearing added to THD::clear_error as a fix

  libmysqld/lib_sql.cc@stripped, 2007-06-19 15:15:38+05:00, holyfoot@stripped +1 -0
    Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
    
    clear THD::killed in clear_error()

  sql/sql_class.h@stripped, 2007-06-19 15:15:38+05:00, holyfoot@stripped +1 -0
    Bug #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists.
    
    clear THD::killed in clear_error()

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/28839/my50-28839

--- 1.335/sql/sql_class.h	2007-06-19 15:15:43 +05:00
+++ 1.336/sql/sql_class.h	2007-06-19 15:15:43 +05:00
@@ -1630,6 +1630,7 @@ public:
     net.last_errno= 0;
     net.report_error= 0;
     query_error= 0;
+    killed= NOT_KILLED;
   }
   inline bool vio_ok() const { return net.vio != 0; }
 #else

--- 1.129/libmysqld/lib_sql.cc	2007-06-19 15:15:43 +05:00
+++ 1.130/libmysqld/lib_sql.cc	2007-06-19 15:15:43 +05:00
@@ -699,6 +699,7 @@ void THD::clear_error()
   net.last_error[0]= 0;
   net.last_errno= 0;
   net.report_error= 0;
+  killed= NOT_KILLED;
 }
 
 static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,