From 3b08919f6afe89416465c77ab7d854a7c85dcb78 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Wed, 20 Jun 2007 14:05:49 +0500
Subject: 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.

clear thd->killed state if we ignore an error
---
 sql/log_event.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sql/log_event.cc')

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 6eb247488b0..0c8b1f6d4c9 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1964,6 +1964,7 @@ Default database: '%s'. Query: '%s'",
     {
       DBUG_PRINT("info",("error ignored"));
       clear_all_errors(thd, rli);
+      thd->killed= THD::NOT_KILLED;
     }
     /*
       Other cases: mostly we expected no error and get one.
-- 
cgit v1.2.1