auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
This commit is contained in:
commit
e31a41d10b
@ -2010,9 +2010,6 @@ static int has_temporary_error(THD *thd)
|
|||||||
{
|
{
|
||||||
DBUG_ENTER("has_temporary_error");
|
DBUG_ENTER("has_temporary_error");
|
||||||
|
|
||||||
if (thd->is_fatal_error)
|
|
||||||
DBUG_RETURN(0);
|
|
||||||
|
|
||||||
DBUG_EXECUTE_IF("all_errors_are_temporary_errors",
|
DBUG_EXECUTE_IF("all_errors_are_temporary_errors",
|
||||||
if (thd->main_da.is_error())
|
if (thd->main_da.is_error())
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user