mirror of
https://github.com/MariaDB/server.git
synced 2026-05-02 13:15:32 +02:00
merge 5.0 => 5.1 : Bug#12329653
This commit is contained in:
commit
e257fb3319
12 changed files with 128 additions and 57 deletions
|
|
@ -1621,6 +1621,8 @@ void st_select_lex::init_query()
|
|||
nest_level= 0;
|
||||
link_next= 0;
|
||||
lock_option= TL_READ_DEFAULT;
|
||||
m_non_agg_field_used= false;
|
||||
m_agg_func_used= false;
|
||||
}
|
||||
|
||||
void st_select_lex::init_select()
|
||||
|
|
@ -1651,7 +1653,8 @@ void st_select_lex::init_select()
|
|||
non_agg_fields.empty();
|
||||
cond_value= having_value= Item::COND_UNDEF;
|
||||
inner_refs_list.empty();
|
||||
full_group_by_flag= 0;
|
||||
m_non_agg_field_used= false;
|
||||
m_agg_func_used= false;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue