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

fixed error handling inside su_select() for multidelete

Browse Source 
(BUG#1839)
This commit is contained in:
bell@sanja.is.com.ua
2003-11-15 21:52:21 +02:00
parent f4d7afd213
commit 2cb4abb5a7
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.cc
View File

@ -5590,6 +5590,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
int error;
bool found=0;
COND *on_expr=join_tab->on_expr, *select_cond=join_tab->select_cond;
my_bool *report_error= &(join->thd->net.report_error);
if (!(error=(*join_tab->read_first_record)(join_tab)))
{
@ -5628,9 +5629,9 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
else
info->file->unlock_row();
}
} while (!(error=info->read_record(info)));
} while (!(error=info->read_record(info)) && !(*report_error));
}
if (error > 0) // Fatal error
if (error > 0 || (*report_error)) // Fatal error
return -1;
if (!found && on_expr)