summaryrefslogtreecommitdiff
path: root/mysql-test/r/ssl.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-12-15 15:55:00 -0800
committerIgor Babaev <igor@askmonty.org>2011-12-15 15:55:00 -0800
commit919f19110fbcfb4326559f48f7ba9fa5c35d904d (patch)
tree38024bb9d1d77ac6bc3a1589ce1e1a52ece5f771 /mysql-test/r/ssl.result
parent4dd456c220f702aeb0c9c32a52d7fe5c05ddca14 (diff)
parent43d9fc32046b1b7ca1a49395f9dd79c145dba215 (diff)
downloadmariadb-git-919f19110fbcfb4326559f48f7ba9fa5c35d904d.tar.gz
Merge
Diffstat (limited to 'mysql-test/r/ssl.result')
-rw-r--r--mysql-test/r/ssl.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index 1a52571c2d7..eae5bb5c2c9 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -1350,6 +1350,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
@@ -1425,6 +1427,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