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

fix of error handling

Browse Source 
mysql-test/r/subselect.result:
  test of error handling with subselect
mysql-test/t/subselect.test:
  test of error handling with subselect
This commit is contained in:
unknown
2002-12-01 00:11:22 +02:00
parent 0b270eb461
commit 1941d9b597
7 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_delete.cc
View File

@@ -140,9 +140,11 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
deleted=0L;
init_ftfuncs(thd, &thd->lex.select_lex, 1);
thd->proc_info="updating";
while (!(error=info.read_record(&info)) && !thd->killed)
while (!(error=info.read_record(&info)) && !thd->killed &&
!thd->net.report_error)
{
if (!(select && select->skipp_record()))
// thd->net.report_error is tested to disallow delete row on error
if (!(select && select->skipp_record())&& !thd->net.report_error )
{
if (!(error=table->file->delete_row(table->record[0])))
{
@@ -205,7 +207,7 @@ cleanup:
thd->lock=0;
}
delete select;
if (error >= 0) // Fatal error
if (error >= 0 || thd->net.report_error)
send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0);
else
{