Commit 290a72d5 authored by Sergey Petrunya's avatar Sergey Petrunya

Check the theory that optimize_wo_join_buffering() doesn't need to...

Check the theory that optimize_wo_join_buffering() doesn't need to save/restore join->cur_sj_inner_tables.
parent 2071ac10
...@@ -11530,8 +11530,8 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab, ...@@ -11530,8 +11530,8 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab,
for (i= first_tab; i <= last_tab; i++) for (i= first_tab; i <= last_tab; i++)
reopt_remaining_tables |= join->positions[i].table->table->map; reopt_remaining_tables |= join->positions[i].table->table->map;
table_map save_cur_sj_inner_tables= join->cur_sj_inner_tables; // table_map save_cur_sj_inner_tables= join->cur_sj_inner_tables;
join->cur_sj_inner_tables= 0; // join->cur_sj_inner_tables= 0;
for (i= first_tab; i <= last_tab; i++) for (i= first_tab; i <= last_tab; i++)
{ {
...@@ -11558,7 +11558,7 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab, ...@@ -11558,7 +11558,7 @@ void optimize_wo_join_buffering(JOIN *join, uint first_tab, uint last_tab,
if (!rs->emb_sj_nest) if (!rs->emb_sj_nest)
*outer_rec_count *= pos.records_read; *outer_rec_count *= pos.records_read;
} }
join->cur_sj_inner_tables= save_cur_sj_inner_tables; // join->cur_sj_inner_tables= save_cur_sj_inner_tables;
*reopt_cost= cost; *reopt_cost= cost;
} }
...@@ -14942,6 +14942,10 @@ join_read_record_no_init(JOIN_TAB *tab) ...@@ -14942,6 +14942,10 @@ join_read_record_no_init(JOIN_TAB *tab)
{ {
Copy_field *save_copy, *save_copy_end; Copy_field *save_copy, *save_copy_end;
/*
init_read_record resets all elements of tab->read_record().
Remember things that we don't want to have reset.
*/
save_copy= tab->read_record.copy_field; save_copy= tab->read_record.copy_field;
save_copy_end= tab->read_record.copy_field_end; save_copy_end= tab->read_record.copy_field_end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment