diff options
author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-06-20 14:05:49 +0500 |
---|---|---|
committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-06-20 14:05:49 +0500 |
commit | 3b08919f6afe89416465c77ab7d854a7c85dcb78 (patch) | |
tree | b5418899e0f368a6345b018ece4ceef0a43ff673 /sql/log_event.cc | |
parent | f015b4332b1db4c903ed6a65b5bbfedcea61abb3 (diff) | |
download | mariadb-git-3b08919f6afe89416465c77ab7d854a7c85dcb78.tar.gz |
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
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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. |