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

Merge commit '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-01-06 10:53:00 +01:00
parent 5f10870c8a 478b83032b
commit 02e7bff882
160 changed files with 2757 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
sql/sql_union.cc
View File

@ -362,7 +362,10 @@ select_union_recursive::create_result_table(THD *thd_arg,
hidden))
return true;
if (! (incr_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types,
incr_table_param.init();
incr_table_param.field_count= column_types->elements;
incr_table_param.bit_fields_as_long= bit_fields_as_long;
if (! (incr_table= create_tmp_table(thd_arg, &incr_table_param, *column_types,
(ORDER*) 0, false, 1,
options, HA_POS_ERROR, &empty_clex_str,
true, keep_row_order)))
@ -372,20 +375,6 @@ select_union_recursive::create_result_table(THD *thd_arg,
for (uint i=0; i < table->s->fields; i++)
incr_table->field[i]->flags &= ~(PART_KEY_FLAG | PART_INDIRECT_KEY_FLAG);
TABLE *rec_table= 0;
if (! (rec_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types,
(ORDER*) 0, false, 1,
options, HA_POS_ERROR, alias,
true, keep_row_order)))
return true;
rec_table->keys_in_use_for_query.clear_all();
for (uint i=0; i < table->s->fields; i++)
rec_table->field[i]->flags &= ~(PART_KEY_FLAG | PART_INDIRECT_KEY_FLAG);
if (rec_tables.push_back(rec_table))
return true;
return false;
}
@ -908,23 +897,25 @@ void select_union_recursive::cleanup()
free_tmp_table(thd, incr_table);
}
List_iterator<TABLE> it(rec_tables);
TABLE *tab;
while ((tab= it++))
List_iterator<TABLE_LIST> it(rec_table_refs);
TABLE_LIST *tbl;
while ((tbl= it++))
{
TABLE *tab= tbl->table;
if (tab->is_created())
{
tab->file->extra(HA_EXTRA_RESET_STATE);
tab->file->ha_delete_all_rows();
}
/*
/*
The table will be closed later in close_thread_tables(),
because it might be used in the statements like
ANALYZE WITH r AS (...) SELECT * from r
where r is defined through recursion.
where r is defined through recursion.
*/
tab->next= thd->rec_tables;
thd->rec_tables= tab;
tbl->derived_result= 0;
}
}
@ -1630,9 +1621,33 @@ bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg,
}
if (!derived_arg->table)
{
derived_arg->table= with_element->rec_result->rec_tables.head();
if (derived_arg->derived_result)
derived_arg->derived_result->table= derived_arg->table;
bool res= false;
if ((!derived_arg->is_with_table_recursive_reference() ||
!derived_arg->derived_result) &&
!(derived_arg->derived_result=
new (thd->mem_root) select_unit(thd)))
goto err; // out of memory
thd->create_tmp_table_for_derived= TRUE;
res= derived_arg->derived_result->create_result_table(thd,
&types,
FALSE,
create_options,
&derived_arg->alias,
FALSE, FALSE,
FALSE, 0);
thd->create_tmp_table_for_derived= FALSE;
if (res)
goto err;
derived_arg->derived_result->set_unit(this);
derived_arg->table= derived_arg->derived_result->table;
if (derived_arg->is_with_table_recursive_reference())
{
/* Here 'derived_arg' is the primary recursive table reference */
derived_arg->with->rec_result->
rec_table_refs.push_back(derived_arg);
}
}
with_element->mark_as_with_prepared_anchor();
is_rec_result_table_created= true;
@ -2428,11 +2443,11 @@ bool st_select_lex_unit::exec_recursive()
TABLE *incr_table= with_element->rec_result->incr_table;
st_select_lex *end= NULL;
bool is_unrestricted= with_element->is_unrestricted();
List_iterator_fast<TABLE> li(with_element->rec_result->rec_tables);
List_iterator_fast<TABLE_LIST> li(with_element->rec_result->rec_table_refs);
TMP_TABLE_PARAM *tmp_table_param= &with_element->rec_result->tmp_table_param;
ha_rows examined_rows= 0;
bool was_executed= executed;
TABLE *rec_table;
TABLE_LIST *rec_tbl;
DBUG_ENTER("st_select_lex_unit::exec_recursive");
@ -2510,8 +2525,9 @@ bool st_select_lex_unit::exec_recursive()
else
with_element->level++;
while ((rec_table= li++))
while ((rec_tbl= li++))
{
TABLE *rec_table= rec_tbl->table;
saved_error=
incr_table->insert_all_rows_into_tmp_table(thd, rec_table,
tmp_table_param,