diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 21:08:59 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-11-14 21:08:59 +0100 |
| commit | 8f798dffea964598eed2a02ed6cfcb7ba7c0fb6e (patch) | |
| tree | bf6c95828bd58132f9ced4ba0c522cbf38d35f6d /sql/sql_delete.cc | |
| parent | b04cd27c9dd36af0104487439547cff4f0c79be3 (diff) | |
| download | mariadb-git-8f798dffea964598eed2a02ed6cfcb7ba7c0fb6e.tar.gz | |
Post-merge fixes.
sql/sql_delete.cc:
Correcting merge error.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index d80f1fe0d13..509e736f6e7 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -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())) { |