From: Tor Didriksen Date: June 27 2011 3:07pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3332) List-Archive: http://lists.mysql.com/commits/139920 Message-Id: <20110627150743.E9F6C141@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7883574388642517800==" --===============7883574388642517800== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/next-mr-opt-team/ based on revid:tor.didriksen@stripped 3332 Tor Didriksen 2011-06-27 new test results after merging from opt-backporting modified: mysql-test/r/join_cache_jcl0.result mysql-test/r/join_cache_jcl1.result mysql-test/r/join_cache_jcl2.result mysql-test/r/join_cache_jcl3.result mysql-test/r/join_cache_jcl4.result === modified file 'mysql-test/r/join_cache_jcl0.result' --- a/mysql-test/r/join_cache_jcl0.result 2011-06-24 13:09:12 +0000 +++ b/mysql-test/r/join_cache_jcl0.result 2011-06-27 15:07:32 +0000 @@ -634,8 +634,8 @@ SELECT Name FROM City WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND City.Population > 100000; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY Country range PRIMARY,Name Name 52 NULL 10 Using index condition; Using MRR -1 PRIMARY City ref Population,Country Country 3 world.Country.Code 18 Using where +1 PRIMARY City ALL Population NULL NULL NULL 4079 Using where +2 DEPENDENT SUBQUERY Country unique_subquery PRIMARY,Name PRIMARY 3 func 1 Using where SELECT Name FROM City WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND City.Population > 100000; @@ -941,8 +941,8 @@ SELECT Name FROM City WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND City.Population > 100000; id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY Country range PRIMARY,Name Name 52 NULL 10 Using index condition; Using MRR -1 PRIMARY City ref Population,Country Country 3 world.Country.Code 18 Using where +1 PRIMARY City ALL Population NULL NULL NULL 4079 Using where +2 DEPENDENT SUBQUERY Country unique_subquery PRIMARY,Name PRIMARY 3 func 1 Using where SELECT Name FROM City WHERE City.Country IN (SELECT Code FROM Country WHERE Country.Name LIKE 'L%') AND City.Population > 100000; @@ -2415,9 +2415,9 @@ id select_type table type possible_keys explain SELECT t3.c1 FROM t3 WHERE t3.c1 IN (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 index PRIMARY PRIMARY 4 NULL 1 Using index; Start temporary -1 PRIMARY t1 ALL col_int_key NULL NULL NULL 1 Using where -1 PRIMARY t3 ref k1 k1 5 test.t1.c2_key 1 Using index; End temporary +1 PRIMARY t3 index NULL k1 5 NULL 2 Using where; Using index +2 DEPENDENT SUBQUERY t2 index PRIMARY PRIMARY 4 NULL 1 Using index +2 DEPENDENT SUBQUERY t1 ref col_int_key col_int_key 4 func 1 Using where SELECT t3.c1 FROM t3 WHERE t3.c1 = SOME (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1) XOR TRUE; === modified file 'mysql-test/r/join_cache_jcl1.result' --- a/mysql-test/r/join_cache_jcl1.result 2011-06-27 14:53:10 +0000 +++ b/mysql-test/r/join_cache_jcl1.result 2011-06-27 15:07:32 +0000 @@ -2415,9 +2415,9 @@ id select_type table type possible_keys explain SELECT t3.c1 FROM t3 WHERE t3.c1 IN (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 index PRIMARY PRIMARY 4 NULL 1 Using index; Start temporary -1 PRIMARY t1 ALL col_int_key NULL NULL NULL 1 Using where; Using join buffer (BNL, regular buffers) -1 PRIMARY t3 ref k1 k1 5 test.t1.c2_key 1 Using index; End temporary +1 PRIMARY t3 index NULL k1 5 NULL 2 Using where; Using index +2 DEPENDENT SUBQUERY t2 index PRIMARY PRIMARY 4 NULL 1 Using index +2 DEPENDENT SUBQUERY t1 ref col_int_key col_int_key 4 func 1 Using where SELECT t3.c1 FROM t3 WHERE t3.c1 = SOME (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1) XOR TRUE; === modified file 'mysql-test/r/join_cache_jcl2.result' --- a/mysql-test/r/join_cache_jcl2.result 2011-06-27 14:53:10 +0000 +++ b/mysql-test/r/join_cache_jcl2.result 2011-06-27 15:07:32 +0000 @@ -2415,9 +2415,9 @@ id select_type table type possible_keys explain SELECT t3.c1 FROM t3 WHERE t3.c1 IN (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 index PRIMARY PRIMARY 4 NULL 1 Using index; Start temporary -1 PRIMARY t1 ALL col_int_key NULL NULL NULL 1 Using where; Using join buffer (BNL, incremental buffers) -1 PRIMARY t3 ref k1 k1 5 test.t1.c2_key 1 Using index; End temporary +1 PRIMARY t3 index NULL k1 5 NULL 2 Using where; Using index +2 DEPENDENT SUBQUERY t2 index PRIMARY PRIMARY 4 NULL 1 Using index +2 DEPENDENT SUBQUERY t1 ref col_int_key col_int_key 4 func 1 Using where SELECT t3.c1 FROM t3 WHERE t3.c1 = SOME (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1) XOR TRUE; === modified file 'mysql-test/r/join_cache_jcl3.result' --- a/mysql-test/r/join_cache_jcl3.result 2011-06-27 14:53:10 +0000 +++ b/mysql-test/r/join_cache_jcl3.result 2011-06-27 15:07:32 +0000 @@ -2415,9 +2415,9 @@ id select_type table type possible_keys explain SELECT t3.c1 FROM t3 WHERE t3.c1 IN (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 index PRIMARY PRIMARY 4 NULL 1 Using index; Start temporary -1 PRIMARY t1 ALL col_int_key NULL NULL NULL 1 Using where; Using join buffer (BNL, regular buffers) -1 PRIMARY t3 ref k1 k1 5 test.t1.c2_key 1 Using index; End temporary +1 PRIMARY t3 index NULL k1 5 NULL 2 Using where; Using index +2 DEPENDENT SUBQUERY t2 index PRIMARY PRIMARY 4 NULL 1 Using index +2 DEPENDENT SUBQUERY t1 ref col_int_key col_int_key 4 func 1 Using where SELECT t3.c1 FROM t3 WHERE t3.c1 = SOME (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1) XOR TRUE; === modified file 'mysql-test/r/join_cache_jcl4.result' --- a/mysql-test/r/join_cache_jcl4.result 2011-06-27 14:53:10 +0000 +++ b/mysql-test/r/join_cache_jcl4.result 2011-06-27 15:07:32 +0000 @@ -2415,9 +2415,9 @@ id select_type table type possible_keys explain SELECT t3.c1 FROM t3 WHERE t3.c1 IN (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t2 index PRIMARY PRIMARY 4 NULL 1 Using index; Start temporary -1 PRIMARY t1 ALL col_int_key NULL NULL NULL 1 Using where; Using join buffer (BNL, incremental buffers) -1 PRIMARY t3 ref k1 k1 5 test.t1.c2_key 1 Using index; End temporary +1 PRIMARY t3 index NULL k1 5 NULL 2 Using where; Using index +2 DEPENDENT SUBQUERY t2 index PRIMARY PRIMARY 4 NULL 1 Using index +2 DEPENDENT SUBQUERY t1 ref col_int_key col_int_key 4 func 1 Using where SELECT t3.c1 FROM t3 WHERE t3.c1 = SOME (SELECT t1.c2_key FROM t2 JOIN t1 ON t2.pk < t1.c1) XOR TRUE; --===============7883574388642517800== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # mnux2qxdiz2ftk4f # target_branch: file:///export/home/didrik/repo/next-mr-opt-team/ # testament_sha1: be9aa986d6c9c9399ff6b5148238183777db57fb # timestamp: 2011-06-27 17:07:43 +0200 # source_branch: file:///export/home/didrik/repo/next-mr-bugfixing/ # base_revision_id: tor.didriksen@stripped\ # ve0yiilm2y49kysk # # Begin bundle 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 BIbVvNazOpdqYi3wG0KaC9P+LuSKcKEhwNDT8A== --===============7883574388642517800==--