diff options
| author | unknown <igor@rurik.mysql.com> | 2004-06-30 05:54:32 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2004-06-30 05:54:32 -0700 |
| commit | defef7eec6abe4095df68fc63572d33b158a1927 (patch) | |
| tree | 847d8aefd2cd8fa8fb332e355923be0b3326f06b /mysql-test/r/join_nested.result | |
| parent | 62746a7780c9e95e6ea37908393b87312a97b4b4 (diff) | |
| download | mariadb-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 'mysql-test/r/join_nested.result')
| -rw-r--r-- | mysql-test/r/join_nested.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/join_nested.result b/mysql-test/r/join_nested.result index d9edc841925..dac8f5a5ba6 100644 --- a/mysql-test/r/join_nested.result +++ b/mysql-test/r/join_nested.result @@ -216,10 +216,10 @@ SELECT t6.a,t6.b,t7.a,t7.b FROM t6,t7; a b a b 3 2 1 1 -6 2 1 1 -6 1 1 1 3 2 2 2 +6 2 1 1 6 2 2 2 +6 1 1 1 6 1 2 2 SELECT t8.a,t8.b FROM t8; @@ -234,8 +234,8 @@ LEFT JOIN t8 ON t7.b=t8.b AND t6.b < 10; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t6 ALL NULL NULL NULL NULL 3 1 SIMPLE t7 ALL NULL NULL NULL NULL 2 +1 SIMPLE t6 ALL NULL NULL NULL NULL 3 1 SIMPLE t8 ALL NULL NULL NULL NULL 2 SELECT t6.a,t6.b,t7.a,t7.b,t8.a,t8.b FROM t6, @@ -245,12 +245,12 @@ t8 ON t7.b=t8.b AND t6.b < 10; a b a b a b 3 2 1 1 NULL NULL -6 2 1 1 NULL NULL -6 1 1 1 NULL NULL 3 2 2 2 0 2 3 2 2 2 1 2 +6 2 1 1 NULL NULL 6 2 2 2 0 2 6 2 2 2 1 2 +6 1 1 1 NULL NULL 6 1 2 2 0 2 6 1 2 2 1 2 SELECT t5.a,t5.b @@ -831,18 +831,18 @@ ON t3.a=1 AND t2.b=t4.b WHERE t1.a <= 2; a b a b a b a b 1 3 3 3 1 2 NULL NULL -2 2 3 3 1 2 NULL NULL 1 3 3 3 2 2 NULL NULL +2 2 3 3 1 2 NULL NULL 2 2 3 3 2 2 NULL NULL 1 3 4 2 1 2 3 2 1 3 4 2 1 2 4 2 +1 3 4 2 2 2 NULL NULL 2 2 4 2 1 2 3 2 2 2 4 2 1 2 4 2 -1 3 4 2 2 2 NULL NULL 2 2 4 2 2 2 NULL NULL 1 3 5 3 1 2 NULL NULL -2 2 5 3 1 2 NULL NULL 1 3 5 3 2 2 NULL NULL +2 2 5 3 1 2 NULL NULL 2 2 5 3 2 2 NULL NULL CREATE INDEX idx_b ON t2(b); EXPLAIN |