From 40b9df39955c37dfe7341f3d8a7e883c48b630a2 Mon Sep 17 00:00:00 2001 From: Alfranio Correia Date: Wed, 19 Aug 2009 16:38:18 +0100 Subject: [PATCH] BUG#45694 Deadlock in replicated statement is not retried If the SQL Thread fails to execute an event due to a temporary error (e.g. ER_LOCK_DEADLOCK) and the option "--slave_transaction_retries" is set the SQL Thread should not be aborted and the transaction should be restarted from the beginning and re-executed. Unfortunately, a wrong interpretation of the THD::is_fatal_error was preventing this behavior. In a nutshell, "this variable is set to TRUE if an execution of a compound statement cannot continue. In particular, it is used to disable access to the CONTINUE or EXIT handlers of stored routines. So even temporary errors may have this variable set. To fix the bug, we have done what follows: DBUG_ENTER("has_temporary_error"); - if (thd->is_fatal_error) - DBUG_RETURN(0); - DBUG_EXECUTE_IF("all_errors_are_temporary_errors", if (thd->main_da.is_error()) { --- sql/slave.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/sql/slave.cc b/sql/slave.cc index 3b64e23ece5..1a903d8ac12 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2010,9 +2010,6 @@ static int has_temporary_error(THD *thd) { DBUG_ENTER("has_temporary_error"); - if (thd->is_fatal_error) - DBUG_RETURN(0); - DBUG_EXECUTE_IF("all_errors_are_temporary_errors", if (thd->main_da.is_error()) {