summaryrefslogtreecommitdiff
path: root/sql/sql_delete.cc
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.local>2006-11-02 01:21:37 +0300
committerunknown <kostja@bodhi.local>2006-11-02 01:21:37 +0300
commit5d1f0164d9e28d691effb18ba6c3dda4f8cc80f1 (patch)
treeb270fc854c7c8674a2ee26f873d2dbd271e36893 /sql/sql_delete.cc
parent0c9fc6ba4064168316f75af929f56e9328cd23af (diff)
parentb7a4d7822fefb1859f196ef026d9e960bc8cfb7e (diff)
downloadmariadb-git-5d1f0164d9e28d691effb18ba6c3dda4f8cc80f1.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge sql/item_sum.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
-rw-r--r--sql/sql_delete.cc2
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);