database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
bell@laptop.sanja.is.com.ua
2003-08-19 20:14:35 +03:00
parent 85f397781b 9333e292ec
commit dd9cbce47b
421 changed files with 14590 additions and 3777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_delete.cc
View File

@ -163,7 +163,15 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
else
{
table->file->print_error(error,MYF(0));
error=0;
/*
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;
}
}