diff options
| author | kroki/tomash@moonlight.intranet <> | 2006-10-25 20:16:39 +0400 |
|---|---|---|
| committer | kroki/tomash@moonlight.intranet <> | 2006-10-25 20:16:39 +0400 |
| commit | 99baff565e1f53393b3c41d303f2b69207ec29a7 (patch) | |
| tree | 7fcc3e7498a3e29131505b90a56a9418258467f8 /sql/sql_delete.cc | |
| parent | 81962878d83e159bda413a541291292a1197983d (diff) | |
| parent | 2c034449714bbe3166023898dbb8b5dc39e862cc (diff) | |
| download | mariadb-git-99baff565e1f53393b3c41d303f2b69207ec29a7.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
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); |