Cleanups

mysql-test/t/distinct.test:
  Cleanup
sql/log.cc:
  Cleanup
sql/slave.cc:
  Cleanup
sql/sql_delete.cc:
  Cleanup
sql/sql_parse.cc:
  Simple optimization

1 files changed, 9 insertions, 6 deletions

diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 96638617610..45acbaaa7ef 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -145,12 +145,15 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
       else
       {
 	table->file->print_error(error,MYF(0));
- 	error=1; /* In < 4.0.14 we set the error number to 0 here, but that
-		 was not sensible, because then MySQL would not roll back the
-		 failed DELETE, and also wrote it to the binlog. For MyISAM
-		 tables a DELETE probably never should fail (?), but for
-		 InnoDB it can fail in a FOREIGN KEY error or an
-		 out-of-tablespace error. (Comment by Heikki July 7, 2003) */
+	/*
+	  In < 4.0.14 we set the error number to 0 here, but that
+	  was not sensible, because then MySQL would not roll back the
+	  failed DELETE, and also wrote it to the binlog. For MyISAM
+	  tables a DELETE probably never should fail (?), but for
+	  InnoDB it can fail in a FOREIGN KEY error or an
+	  out-of-tablespace error.
+	*/
+ 	error= 1;
 	break;
       }
     }