diff options
| author | kostja@bodhi.local <> | 2006-11-02 01:21:37 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-11-02 01:21:37 +0300 |
| commit | b471ea50f7652591f9cea28ce14b5d95f82d7dac (patch) | |
| tree | b270fc854c7c8674a2ee26f873d2dbd271e36893 /sql/sql_delete.cc | |
| parent | 7acfde913a3492e3adc0ab649fdfdf8b4c70d0ac (diff) | |
| parent | 5961d4721f1ed56f82bc7c30e080f5ea67e3d3ac (diff) | |
| download | mariadb-git-b471ea50f7652591f9cea28ce14b5d95f82d7dac.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 87a6575cc64..e13e7728708 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -322,7 +322,7 @@ cleanup: mysql_unlock_tables(thd, thd->lock); thd->lock=0; } - if (error < 0) + if (error < 0 || (thd->lex->ignore && !thd->is_fatal_error)) { thd->row_count_func= deleted; send_ok(thd,deleted); |