From a4073c1990b5513730b8c070232f5de080dcd2bf Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Fri, 16 Dec 2011 14:19:58 +0400 Subject: [PATCH] Update test results for previous push --- mysql-test/r/named_pipe.result | 3 +++ mysql-test/r/shm.result | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mysql-test/r/named_pipe.result b/mysql-test/r/named_pipe.result index dbe552eeeeb..609fb80c811 100644 --- a/mysql-test/r/named_pipe.result +++ b/mysql-test/r/named_pipe.result @@ -1347,6 +1347,8 @@ fld1 fld1 250503 250505 250504 250505 250505 250505 +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='outer_join_with_cache=off'; insert into t2 (fld1, companynr) values (999999,99); select t2.companynr,companyname from t2 left join t4 using (companynr) where t4.companynr is null; companynr companyname @@ -1422,6 +1424,7 @@ explain select companynr,companyname from t4 left join t2 using (companynr) wher id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t4 ALL NULL NULL NULL NULL 12 Using where 1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where +SET optimizer_switch=@save_optimizer_switch; select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; companynr companynr 37 36 diff --git a/mysql-test/r/shm.result b/mysql-test/r/shm.result index 4dfb88771aa..f6ce63555d7 100644 --- a/mysql-test/r/shm.result +++ b/mysql-test/r/shm.result @@ -1347,6 +1347,8 @@ fld1 fld1 250503 250505 250504 250505 250505 250505 +SET @save_optimizer_switch=@@optimizer_switch; +SET optimizer_switch='outer_join_with_cache=off'; insert into t2 (fld1, companynr) values (999999,99); select t2.companynr,companyname from t2 left join t4 using (companynr) where t4.companynr is null; companynr companyname @@ -1422,6 +1424,7 @@ explain select companynr,companyname from t4 left join t2 using (companynr) wher id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t4 ALL NULL NULL NULL NULL 12 Using where 1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where +SET optimizer_switch=@save_optimizer_switch; select distinct t2.companynr,t4.companynr from t2,t4 where t2.companynr=t4.companynr+1; companynr companynr 37 36