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

e31a41d1 · Alfranio Correia · 9a632549 · 40b9df39 · e31a41d1
Commit e31a41d1 authored Aug 24, 2009 by Alfranio Correia
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sql/slave.cc sql/slave.cc +0 -3

No files found.
--- 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())
                  {