bk commit into 5.1 tree (mkindahl:1.2613)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-14 21:08:59+01:00, mkindahl@stripped +1 -0
  Post-merge fixes.

  sql/sql_delete.cc@stripped, 2007-11-14 21:08:55+01:00, mkindahl@stripped +1 -1
    Correcting merge error.

diff -Nrup a/sql/sql_delete.cc b/sql/sql_delete.cc
--- a/sql/sql_delete.cc	2007-11-14 11:07:23 +01:00
+++ b/sql/sql_delete.cc	2007-11-14 21:08:55 +01:00
@@ -309,7 +309,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *
       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()))
   {