summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorGleb Shchepa <gshchepa@mysql.com>2008-10-08 02:52:49 +0500
committerGleb Shchepa <gshchepa@mysql.com>2008-10-08 02:52:49 +0500
commit39996b44cce1cb40fe3ae0634c735626c3a103e0 (patch)
tree0410f91fd4242a83c6223b770ea87e32d5e28c00 /sql/sql_lex.cc
parent5898c53c549aa794b14a3769a21878b50729de1f (diff)
parentf48b42e77657dd2e27380201631fd0f137863b85 (diff)
downloadmariadb-git-39996b44cce1cb40fe3ae0634c735626c3a103e0.tar.gz
manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 18c61910e89..4ac73baa992 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -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;