summaryrefslogtreecommitdiff
path: root/sql/sql_lex.h
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2004-06-30 05:54:32 -0700
committerunknown <igor@rurik.mysql.com>2004-06-30 05:54:32 -0700
commitdefef7eec6abe4095df68fc63572d33b158a1927 (patch)
tree847d8aefd2cd8fa8fb332e355923be0b3326f06b /sql/sql_lex.h
parent62746a7780c9e95e6ea37908393b87312a97b4b4 (diff)
downloadmariadb-git-defef7eec6abe4095df68fc63572d33b158a1927.tar.gz
subselect2.result, select.result:
Post-merge fixes for nested joins. The join_tab_cmp function in sql_select has been changed. join_nested.result: Post-merge fixes for nested joins. The join_tab_cmp function in sql_select has been changed sql_select.cc: Post-merge fixes for nested joins. Avoided re-execution of eliminate_not_funcs and simplify_joins in optimize_cond. Changed the join_tab_cmp function to take into account the dependent relation. sql_lex.cc, sql_lex.h: Added the first_cond_optimization flag to st_select_lex to avoid re-execution of some optimizations in optimize_cond. sql_base.cc: Post-merge fixes for nested joins. Fixed problems with a proper column list substituted for '*' in queries with natural joins. sql/sql_base.cc: Post-merge fixes for nested joins. Fixed problems with a proper column list substituted for '*' in queries with natural joins. sql/sql_lex.h: Added the first_cond_optimization flag to st_select_lex to avoid re-execution of some optimizations in optimize_cond. sql/sql_lex.cc: Added the first_cond_optimization flag to st_select_lex to avoid re-execution of some optimizations in optimize_cond. sql/sql_select.cc: Post-merge fixes for nested joins. Avoided re-execution of eliminate_not_funcs and simplify_joins in optimize_cond. Changed the join_tab_cmp function to take into account the dependent relation. mysql-test/r/join_nested.result: Post-merge fixes for nested joins. The join_tab_cmp function in sql_select has been changed mysql-test/r/select.result: Post-merge fixes for nested joins. The join_tab_cmp function in sql_select has been changed. mysql-test/r/subselect2.result: Post-merge fixes for nested joins. The join_tab_cmp function in sql_select has been changed.
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r--sql/sql_lex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 3f41821c9c9..02b3da55921 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -454,6 +454,7 @@ public:
/* explicit LIMIT clause was used */
bool explicit_limit;
bool first_execution; /* first execution in SP or PS */
+ bool first_cond_optimization;
/*
SELECT for SELECT command st_select_lex. Used to privent scaning