Merge from 5.0-bugteam

This commit is contained in:
Staale Smedseng 2009-06-17 16:56:44 +02:00
23 changed files with 204 additions and 223 deletions

View file

@ -806,7 +806,7 @@ void multi_delete::abort()
/* the error was handled or nothing deleted and no side effects return */
if (error_handled ||
!thd->transaction.stmt.modified_non_trans_table && !deleted)
(!thd->transaction.stmt.modified_non_trans_table && !deleted))
DBUG_VOID_RETURN;
/* Something already deleted so we have to invalidate cache */