1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/select_handler.cc
View File

@ -103,9 +103,6 @@ bool Pushdown_select::send_data()
Protocol *protocol= thd->protocol; Protocol *protocol= thd->protocol;
DBUG_ENTER("Pushdown_select::send_data"); DBUG_ENTER("Pushdown_select::send_data");
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(false);
protocol->prepare_for_resend(); protocol->prepare_for_resend();
if (protocol->send_result_set_row(&result_columns)) if (protocol->send_result_set_row(&result_columns))
{ {

12
sql/sql_class.cc
View File

@ -3015,9 +3015,6 @@ int select_send::send_data(List<Item> &items)
Protocol *protocol= thd->protocol; Protocol *protocol= thd->protocol;
DBUG_ENTER("select_send::send_data"); DBUG_ENTER("select_send::send_data");
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(FALSE);
protocol->prepare_for_resend(); protocol->prepare_for_resend();
if (protocol->send_result_set_row(&items)) if (protocol->send_result_set_row(&items))
{ {
@ -3279,8 +3276,6 @@ int select_export::send_data(List<Item> &items)
String tmp(buff,sizeof(buff),&my_charset_bin),*res; String tmp(buff,sizeof(buff),&my_charset_bin),*res;
tmp.length(0); tmp.length(0);
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(0);
row_count++; row_count++;
Item *item; Item *item;
uint used_length=0,items_left=items.elements; uint used_length=0,items_left=items.elements;
@ -3534,9 +3529,6 @@ int select_dump::send_data(List<Item> &items)
Item *item; Item *item;
DBUG_ENTER("select_dump::send_data"); DBUG_ENTER("select_dump::send_data");
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(0);
if (row_count++ > 1) if (row_count++ > 1)
{ {
my_message(ER_TOO_MANY_ROWS, ER_THD(thd, ER_TOO_MANY_ROWS), MYF(0)); my_message(ER_TOO_MANY_ROWS, ER_THD(thd, ER_TOO_MANY_ROWS), MYF(0));
@ -3572,8 +3564,6 @@ int select_singlerow_subselect::send_data(List<Item> &items)
MYF(current_thd->lex->ignore ? ME_WARNING : 0)); MYF(current_thd->lex->ignore ? ME_WARNING : 0));
DBUG_RETURN(1); DBUG_RETURN(1);
} }
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(0);
List_iterator_fast<Item> li(items); List_iterator_fast<Item> li(items);
Item *val_item; Item *val_item;
for (uint i= 0; (val_item= li++); i++) for (uint i= 0; (val_item= li++); i++)
@ -3708,8 +3698,6 @@ int select_exists_subselect::send_data(List<Item> &items)
{ {
DBUG_ENTER("select_exists_subselect::send_data"); DBUG_ENTER("select_exists_subselect::send_data");
Item_exists_subselect *it= (Item_exists_subselect *)item; Item_exists_subselect *it= (Item_exists_subselect *)item;
if (thd->killed == ABORT_QUERY)
DBUG_RETURN(0);
it->value= 1; it->value= 1;
it->assigned(1); it->assigned(1);
DBUG_RETURN(0); DBUG_RETURN(0);

4
sql/sql_class.h
View File

@ -5101,6 +5101,10 @@ public:
{ {
if (u->lim.check_offset(sent)) if (u->lim.check_offset(sent))
return 0; return 0;
if (u->thd->killed == ABORT_QUERY)
return 0;
return send_data(items); return send_data(items);
} }
/* /*

3
sql/sql_insert.cc
View File

@ -3857,9 +3857,6 @@ int select_insert::send_data(List<Item> &values)
DBUG_ENTER("select_insert::send_data"); DBUG_ENTER("select_insert::send_data");
bool error=0; bool error=0;
if (unlikely(thd->killed == ABORT_QUERY))
DBUG_RETURN(0);
thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields thd->count_cuted_fields= CHECK_FIELD_WARN; // Calculate cuted fields
store_values(values); store_values(values);
if (table->default_field && if (table->default_field &&

6
sql/sql_union.cc
View File

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