Skip to content

M
MariaDB
Commit d7f570c0 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files
Options

Post-merge fixes.

parent 23cd47e0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_delete.cc
View file @ d7f570c0
...@@ -309,7 +309,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ...@@ -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()))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7