database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
This commit is contained in:
kostja@bodhi.local
2006-11-02 01:08:39 +03:00
parent dc2ca8ca10 77f1d01fbb
commit 6a28c436f7
23 changed files with 491 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_delete.cc
View File

@@ -258,7 +258,8 @@ cleanup:
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
if (error >= 0 || thd->net.report_error)
if ((error >= 0 || thd->net.report_error) &&
(!thd->lex->ignore || thd->is_fatal_error))
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0);
else
{