1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a valgrind problem.

Browse Source 
The function setup_tables should handle table_list elements for
semijoin materialized tables in a special way when executing
a prepared statement for the second time.
This commit is contained in:
Igor Babaev 2011-06-23 22:12:22 -07:00
parent 3cf0d6f446
commit d6b0767c8c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -7829,10 +7829,17 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
List_iterator_fast <TABLE_LIST> ti(select_lex->leaf_tables_exec); List_iterator_fast <TABLE_LIST> ti(select_lex->leaf_tables_exec);
select_lex->leaf_tables.empty(); select_lex->leaf_tables.empty();
while ((table_list= ti++)) while ((table_list= ti++))
{
if(table_list->jtbm_subselect)
{
table_list->jtbm_table_no= table_list->tablenr_exec;
}
else
{ {
table_list->table->tablenr= table_list->tablenr_exec; table_list->table->tablenr= table_list->tablenr_exec;
table_list->table->map= table_list->map_exec; table_list->table->map= table_list->map_exec;
table_list->table->pos_in_table_list= table_list; table_list->table->pos_in_table_list= table_list;
}
select_lex->leaf_tables.push_back(table_list); select_lex->leaf_tables.push_back(table_list);
} }
} }

1
sql/sql_select.cc
View File

@ -826,6 +826,7 @@ inject_jtbm_conds(JOIN *join, List<TABLE_LIST> *join_list, Item **join_where)
//repeat of convert_subq_to_jtbm: //repeat of convert_subq_to_jtbm:
table->table= hash_sj_engine->tmp_table; table->table= hash_sj_engine->tmp_table;
table->table->pos_in_table_list= table;
setup_table_map(table->table, table, table->jtbm_table_no); setup_table_map(table->table, table, table->jtbm_table_no);