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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-09-04 18:44:44 +03:00
parent 938db04898 7f8cd326c6
commit 5ff7e68c7e
94 changed files with 2110 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -1137,6 +1137,8 @@ JOIN::prepare(TABLE_LIST *tables_init, COND *conds_init, uint og_num,
proc_param= proc_param_init;
tables_list= tables_init;
select_lex= select_lex_arg;
DBUG_PRINT("info", ("select %p (%u) = JOIN %p",
select_lex, select_lex->select_number, this));
select_lex->join= this;
join_list= &select_lex->top_join_list;
union_part= unit_arg->is_unit_op();
@ -4471,6 +4473,9 @@ int
JOIN::destroy()
{
DBUG_ENTER("JOIN::destroy");
DBUG_PRINT("info", ("select %p (%u) <> JOIN %p",
select_lex, select_lex->select_number, this));
select_lex->join= 0;
cond_equal= 0;
@ -23733,6 +23738,9 @@ check_reverse_order:
else if (select && select->quick)
select->quick->need_sorted_output();
tab->read_record.unlock_row= (tab->type == JT_EQ_REF) ?
join_read_key_unlock_row : rr_unlock_row;
} // QEP has been modified
/*