diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-03-10 15:55:40 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-03-10 15:55:40 +0200 |
| commit | 7e26959277416489a2f6b26c82332110e0135c26 (patch) | |
| tree | 9fe6b73da5b00c264cf4abf14113683062a3b2d3 /sql/sql_delete.cc | |
| parent | 3e32ba3ff1068c19dbf0c69de991da426cf7f327 (diff) | |
| parent | 77afc2be46e0a815357795a0ab0977115c8a313d (diff) | |
| download | mariadb-git-7e26959277416489a2f6b26c82332110e0135c26.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 0404e552dfc..4fc618ca050 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -335,8 +335,11 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, InnoDB it can fail in a FOREIGN KEY error or an out-of-tablespace error. */ - error= 1; - break; + if (!select_lex->no_error) + { + error= 1; + break; + } } } else |