From cc2298ebb7e1225d6a293281bc949d746040d547 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Wed, 4 Apr 2012 21:35:34 +0400 Subject: [PATCH] Make test results stable. --- mysql-test/r/subselect_sj2.result | 6 +++--- mysql-test/r/subselect_sj2_jcl6.result | 6 +++--- mysql-test/r/subselect_sj2_mat.result | 6 +++--- mysql-test/t/subselect_sj2.test | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mysql-test/r/subselect_sj2.result b/mysql-test/r/subselect_sj2.result index b54d4e8db56..be3e05c7a50 100644 --- a/mysql-test/r/subselect_sj2.result +++ b/mysql-test/r/subselect_sj2.result @@ -95,9 +95,9 @@ A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a from t0 A, t0 B where B.a <5; explain select * from t3 where b in (select a from t0); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t3 ALL b NULL NULL NULL 56 -1 PRIMARY eq_ref distinct_key distinct_key 4 func 1 -2 MATERIALIZED t0 ALL NULL NULL NULL NULL 10 +1 PRIMARY t3 ALL b NULL NULL NULL # +1 PRIMARY eq_ref distinct_key distinct_key 4 func # +2 MATERIALIZED t0 ALL NULL NULL NULL NULL # set @save_ecp= @@engine_condition_pushdown; set engine_condition_pushdown=0; select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5); diff --git a/mysql-test/r/subselect_sj2_jcl6.result b/mysql-test/r/subselect_sj2_jcl6.result index 172a4a40f4c..44cdb69e132 100644 --- a/mysql-test/r/subselect_sj2_jcl6.result +++ b/mysql-test/r/subselect_sj2_jcl6.result @@ -106,9 +106,9 @@ A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a from t0 A, t0 B where B.a <5; explain select * from t3 where b in (select a from t0); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t3 ALL b NULL NULL NULL 56 -1 PRIMARY eq_ref distinct_key distinct_key 4 func 1 -2 MATERIALIZED t0 ALL NULL NULL NULL NULL 10 +1 PRIMARY t3 ALL b NULL NULL NULL # +1 PRIMARY eq_ref distinct_key distinct_key 4 func # +2 MATERIALIZED t0 ALL NULL NULL NULL NULL # set @save_ecp= @@engine_condition_pushdown; set engine_condition_pushdown=0; select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5); diff --git a/mysql-test/r/subselect_sj2_mat.result b/mysql-test/r/subselect_sj2_mat.result index 8acdbab9a12..4bce431a771 100644 --- a/mysql-test/r/subselect_sj2_mat.result +++ b/mysql-test/r/subselect_sj2_mat.result @@ -97,9 +97,9 @@ A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a from t0 A, t0 B where B.a <5; explain select * from t3 where b in (select a from t0); id select_type table type possible_keys key key_len ref rows Extra -1 PRIMARY t3 ALL b NULL NULL NULL 46 -1 PRIMARY eq_ref distinct_key distinct_key 4 func 1 -2 MATERIALIZED t0 ALL NULL NULL NULL NULL 10 +1 PRIMARY t3 ALL b NULL NULL NULL # +1 PRIMARY eq_ref distinct_key distinct_key 4 func # +2 MATERIALIZED t0 ALL NULL NULL NULL NULL # set @save_ecp= @@engine_condition_pushdown; set engine_condition_pushdown=0; select * from t3 where b in (select A.a+B.a from t0 A, t0 B where B.a<5); diff --git a/mysql-test/t/subselect_sj2.test b/mysql-test/t/subselect_sj2.test index b9a1b91771e..1afc39264ea 100644 --- a/mysql-test/t/subselect_sj2.test +++ b/mysql-test/t/subselect_sj2.test @@ -78,6 +78,7 @@ insert into t3 select A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a, A.a + 10*B.a from t0 A, t0 B where B.a <5; +--replace_column 9 # explain select * from t3 where b in (select a from t0); # Because of BUG#40154, run the next select w/o index condition pushdown: set @save_ecp= @@engine_condition_pushdown;