diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:16:39 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-25 20:16:39 +0400 |
| commit | 853fb1ebfee80873899f7ee49d0a4d9d92b18357 (patch) | |
| tree | 7fcc3e7498a3e29131505b90a56a9418258467f8 /sql/sql_delete.cc | |
| parent | 6831ea7da790dafdaacb0c5bf6bae0cfb268d3e2 (diff) | |
| parent | 6137ef86a98745cc818ed1de0580e628efc0d3ec (diff) | |
| download | mariadb-git-853fb1ebfee80873899f7ee49d0a4d9d92b18357.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/innodb_mysql.test:
Auto merged
sql/sql_delete.cc:
Auto merged
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 3e3378542aa..09bea953cc1 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -317,7 +317,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); |