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

MDEV-18553: MDEV-16327 pre-requisits part 3: move kill check in one place

Browse Source 
Kill check moved from send_data() methids in its wrapper:
send_data_with_check().
This commit is contained in:
Oleksandr Byelkin
2019-09-30 17:20:28 +02:00
parent 1ae02f0e0d
commit a6de640804
5 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_union.cc
View File

@ -111,8 +111,7 @@ int select_unit::send_data(List<Item> &values)
{
int rc= 0;
int not_reported_error= 0;
if (thd->killed == ABORT_QUERY)
return 0;
if (table->no_rows_with_nulls)
table->null_catch_flags= CHECK_ROW_FOR_NULLS_TO_REJECT;
@ -602,8 +601,7 @@ int select_unit_ext::send_data(List<Item> &values)
int rc= 0;
int not_reported_error= 0;
int find_res;
if (thd->killed == ABORT_QUERY)
return 0;
if (table->no_rows_with_nulls)
table->null_catch_flags= CHECK_ROW_FOR_NULLS_TO_REJECT;