manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc

This commit is contained in:
Gleb Shchepa 2008-10-08 02:52:49 +05:00
commit 39996b44cc
9 changed files with 202 additions and 24 deletions

View file

@ -1553,6 +1553,7 @@ void st_select_lex::init_query()
subquery_in_having= explicit_limit= 0;
is_item_list_lookup= 0;
first_execution= 1;
first_natural_join_processing= 1;
first_cond_optimization= 1;
parsing_place= NO_MATTER;
exclude_from_table_unique_test= no_wrap_view_item= FALSE;