Post-merge fixes.
This commit is contained in:
parent
23cd47e0e1
commit
d7f570c056
@ -309,7 +309,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
|
||||
table->file->unlock_row(); // Row failed selection, release lock on it
|
||||
}
|
||||
killed_status= thd->killed;
|
||||
if (killed_status == THD::NOT_KILLED || thd->is_error())
|
||||
if (killed_status != THD::NOT_KILLED || thd->is_error())
|
||||
error= 1; // Aborted
|
||||
if (will_batch && (loc_error= table->file->end_bulk_delete()))
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user