auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam

16 years ago · 793e523b4e
1 changed files with 0 additions and 3 deletions
--- 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())
                  {