From: Ole John Aske Date: February 9 2012 8:15am Subject: bzr push into mysql-trunk branch (ole.john.aske:3859 to 3860) WL#5558 List-Archive: http://lists.mysql.com/commits/142809 Message-Id: <20120209081516.434A8235@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3860 Ole John Aske 2012-02-09 Followup fix for WL#5558: Resolve ORDER BY execution method at the optimization stage. Changed result files for a few MTR tests requiring '-ps' and as such was not run as part of a plain MTR test. @ mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. @ mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. @ mysql-test/suite/opt_trace/r/range_ps_prot.result Change in optimizer trace as test_if_skip_sort_order() is now done as part of 'optimize' instead of in 'execute' phase. modified: mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/range_ps_prot.result 3859 Ole John Aske 2012-02-08 Created branch mysql-trunk-wl5558_2 based on current mysql-trunk, revno: 3858, with the addition of WL5558 patches. modified: mysql-test/r/group_by.result mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bka_nixbnl.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_nojb.result mysql-test/r/select_found.result mysql-test/r/subquery_mat_none.result mysql-test/suite/opt_trace/r/bugs_no_prot_all.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result sql/sql_executor.cc sql/sql_optimizer.cc sql/sql_optimizer.h sql/sql_select.cc === modified file 'mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result' --- a/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result 2012-01-30 13:13:15 +0000 +++ b/mysql-test/suite/opt_trace/r/bugs_ps_prot_all.result 2012-02-09 08:13:30 +0000 @@ -2280,14 +2280,7 @@ SELECT 1 FROM t1 WHERE 1 LIKE "table": "t1" } ] /* refine_plan */ - } - ] /* steps */ - } /* join_optimization */ - }, - { - "join_execution": { - "select#": 2, - "steps": [ + }, { "reconsidering_access_paths_for_index_ordering": { "index_order_summary": { @@ -2301,6 +2294,13 @@ SELECT 1 FROM t1 WHERE 1 LIKE } /* reconsidering_access_paths_for_index_ordering */ } ] /* steps */ + } /* join_optimization */ + }, + { + "join_execution": { + "select#": 2, + "steps": [ + ] /* steps */ } /* join_execution */ } ] /* steps */ === modified file 'mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result' --- a/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result 2012-01-30 08:57:24 +0000 +++ b/mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result 2012-02-09 08:13:30 +0000 @@ -1761,14 +1761,7 @@ SELECT 1 FROM t1 WHERE 1 LIKE "table": "t1" } ] /* refine_plan */ - } - ] /* steps */ - } /* join_optimization */ - }, - { - "join_execution": { - "select#": 2, - "steps": [ + }, { "reconsidering_access_paths_for_index_ordering": { "index_order_summary": { @@ -1782,6 +1775,13 @@ SELECT 1 FROM t1 WHERE 1 LIKE } /* reconsidering_access_paths_for_index_ordering */ } ] /* steps */ + } /* join_optimization */ + }, + { + "join_execution": { + "select#": 2, + "steps": [ + ] /* steps */ } /* join_execution */ } ] /* steps */ === modified file 'mysql-test/suite/opt_trace/r/range_ps_prot.result' --- a/mysql-test/suite/opt_trace/r/range_ps_prot.result 2012-01-30 08:57:24 +0000 +++ b/mysql-test/suite/opt_trace/r/range_ps_prot.result 2012-02-09 08:13:30 +0000 @@ -878,10 +878,6 @@ EXPLAIN SELECT key2, MIN(key2_1) FROM t2 "join_explain": { "select#": 1, "steps": [ - { - "reconsidering_access_paths_for_index_ordering": { - } /* reconsidering_access_paths_for_index_ordering */ - } ] /* steps */ } /* join_explain */ } @@ -1417,10 +1413,6 @@ GROUP BY key2 { "join_explain": { "select#": 1, "steps": [ - { - "reconsidering_access_paths_for_index_ordering": { - } /* reconsidering_access_paths_for_index_ordering */ - } ] /* steps */ } /* join_explain */ } @@ -4643,14 +4635,7 @@ EXPLAIN SELECT * FROM t1 WHERE i1 > '2' "access_type": "range" } ] /* refine_plan */ - } - ] /* steps */ - } /* join_optimization */ - }, - { - "join_explain": { - "select#": 1, - "steps": [ + }, { "reconsidering_access_paths_for_index_ordering": { "rows_estimation": { @@ -4730,6 +4715,13 @@ EXPLAIN SELECT * FROM t1 WHERE i1 > '2' } /* reconsidering_access_paths_for_index_ordering */ } ] /* steps */ + } /* join_optimization */ + }, + { + "join_explain": { + "select#": 1, + "steps": [ + ] /* steps */ } /* join_explain */ } ] /* steps */ @@ -5075,18 +5067,6 @@ EXPLAIN SELECT DISTINCT i1 FROM t1 WHERE "join_explain": { "select#": 1, "steps": [ - { - "reconsidering_access_paths_for_index_ordering": { - "index_order_summary": { - "database": "test", - "table": "t1", - "index": "k1", - "order_direction": "desc", - "plan_changed": true, - "access_type": "index_scan" - } /* index_order_summary */ - } /* reconsidering_access_paths_for_index_ordering */ - } ] /* steps */ } /* join_explain */ } @@ -6235,14 +6215,7 @@ EXPLAIN SELECT * FROM t1 WHERE c1 = '1' "table_condition_attached": null } ] /* refine_plan */ - } - ] /* steps */ - } /* join_optimization */ - }, - { - "join_explain": { - "select#": 1, - "steps": [ + }, { "reconsidering_access_paths_for_index_ordering": { "index_order_summary": { @@ -6257,6 +6230,13 @@ EXPLAIN SELECT * FROM t1 WHERE c1 = '1' } /* reconsidering_access_paths_for_index_ordering */ } ] /* steps */ + } /* join_optimization */ + }, + { + "join_explain": { + "select#": 1, + "steps": [ + ] /* steps */ } /* join_explain */ } ] /* steps */ No bundle (reason: useless for push emails).