1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fixes.

Browse Source
This commit is contained in:
mkindahl@dl145h.mysql.com 2007-11-14 21:08:59 +01:00
parent 23cd47e0e1
commit d7f570c056
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@ -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 table->file->unlock_row(); // Row failed selection, release lock on it
} }
killed_status= thd->killed; 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 error= 1; // Aborted
if (will_batch && (loc_error= table->file->end_bulk_delete())) if (will_batch && (loc_error= table->file->end_bulk_delete()))
{ {