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

Fixed 2 valgrind bugs in the tree for mwl #106.

Browse Source 
One was due the fact that the field SELECT_LEX::insert_tables was not
initialized while the second was due to missing initialization of
JOIN_TAB::preread_init_done in subselect_hash_sj_engine::make_unique_engine. 
Removed an invalid assert.
This commit is contained in:
Igor Babaev 2011-05-22 15:47:46 -07:00
parent 63d6dbc4ab
commit 317e04ce67
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/item_subselect.cc
View File

@ -4165,6 +4165,7 @@ subselect_hash_sj_engine::make_unique_engine()
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
tab->table= tmp_table; tab->table= tmp_table;
tab->preread_init_done= FALSE;
tab->ref.tmp_table_index_lookup_init(thd, tmp_key, it, FALSE); tab->ref.tmp_table_index_lookup_init(thd, tmp_key, it, FALSE);
DBUG_RETURN(new subselect_uniquesubquery_engine(thd, tab, item, DBUG_RETURN(new subselect_uniquesubquery_engine(thd, tab, item,

1
sql/sql_lex.cc
View File

@ -1672,6 +1672,7 @@ void st_select_lex::init_select()
cond_value= having_value= Item::COND_UNDEF; cond_value= having_value= Item::COND_UNDEF;
inner_refs_list.empty(); inner_refs_list.empty();
full_group_by_flag= 0; full_group_by_flag= 0;
insert_tables= 0;
merged_into= 0; merged_into= 0;
} }

1
sql/table.cc
View File

@ -3797,7 +3797,6 @@ bool TABLE_LIST::prep_check_option(THD *thd, uint8 check_opt_type)
if (where) if (where)
{ {
DBUG_ASSERT(where->fixed);
check_option= where->copy_andor_structure(thd); check_option= where->copy_andor_structure(thd);
} }
if (is_cascaded) if (is_cascaded)