database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819

Browse Source 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819


mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
This commit is contained in:
unknown
2006-10-25 20:00:51 +04:00
parent d4553e3558 e3d49f0c3f
commit e171a36efb
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_delete.cc
View File

@ -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);