database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

- Fix incorrectly-removed piece of code JOIN::save_qpf

Browse Source 
- update mysqld--help.result
This commit is contained in:
Sergey Petrunya
2013-09-25 15:51:16 +04:00
parent ccca339459
commit c0028bd2ac
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqld--help.result
View File

@@ -344,7 +344,7 @@ The following options may be given as the first argument:
log if it is open. log if it is open.
--log-slow-verbosity=name --log-slow-verbosity=name
log-slow-verbosity=[value[,value ...]] where value is one log-slow-verbosity=[value[,value ...]] where value is one
of 'innodb', 'query_plan' of 'innodb', 'query_plan', 'explain'
--log-tc=name Path to transaction coordinator log (used for --log-tc=name Path to transaction coordinator log (used for
transactions that affect more than one storage engine, transactions that affect more than one storage engine,
when binary log is disabled). when binary log is disabled).

11
sql/sql_select.cc
View File

@@ -22553,8 +22553,6 @@ int JOIN::save_qpf(QPF_query *output, bool need_tmp_table, bool need_order,
table_map used_tables=0; table_map used_tables=0;
join->select_lex->set_explain_type(true); join->select_lex->set_explain_type(true);
uint select_id= join->select_lex->select_number;
qp_sel->select_id= join->select_lex->select_number; qp_sel->select_id= join->select_lex->select_number;
qp_sel->select_type= join->select_lex->type; qp_sel->select_type= join->select_lex->type;
@@ -22563,6 +22561,15 @@ int JOIN::save_qpf(QPF_query *output, bool need_tmp_table, bool need_order,
for (JOIN_TAB *tab= first_breadth_first_tab(join, WALK_OPTIMIZATION_TABS); tab; for (JOIN_TAB *tab= first_breadth_first_tab(join, WALK_OPTIMIZATION_TABS); tab;
tab= next_breadth_first_tab(join, WALK_OPTIMIZATION_TABS, tab)) tab= next_breadth_first_tab(join, WALK_OPTIMIZATION_TABS, tab))
{ {
uint select_id;
if (tab->bush_root_tab)
{
JOIN_TAB *first_sibling= tab->bush_root_tab->bush_children->start;
select_id= first_sibling->emb_sj_nest->sj_subq_pred->get_identifier();
}
else
select_id= join->select_lex->select_number;
TABLE *table=tab->table; TABLE *table=tab->table;
TABLE_LIST *table_list= tab->table->pos_in_table_list; TABLE_LIST *table_list= tab->table->pos_in_table_list;
char buff4[512]; char buff4[512];