diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-08-24 11:37:44 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-08-24 11:37:44 +0100 |
| commit | e31a41d10be057fd5b2928b8e03a78e734d39b2a (patch) | |
| tree | f1d0c3cac496f081c4645e93e0ef085af1a4f6df /sql | |
| parent | 9a632549da0292679d585580e10b956475c33740 (diff) | |
| parent | 40b9df39955c37dfe7341f3d8a7e883c48b630a2 (diff) | |
| download | mariadb-git-e31a41d10be057fd5b2928b8e03a78e734d39b2a.tar.gz | |
auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index ee8bdfe9e9f..fac9ee214c5 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()) { |