summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-07-09 00:55:07 +0300
committermonty@mashka.mysql.fi <>2003-07-09 00:55:07 +0300
commitd495656ac58a2fca1cc5b1ffd3e36985cbcb0baa (patch)
tree2d918b1ab9c85dbf33a1677a53e76b3447a7733c /sql/sql_delete.cc
parentd9e7072210704cbfdc619407158a3a7ac65ec506 (diff)
downloadmariadb-git-d495656ac58a2fca1cc5b1ffd3e36985cbcb0baa.tar.gz
Cleanups
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc15
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;
}
}