summaryrefslogtreecommitdiff
path: root/mysql-test/r/index_merge_myisam.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-02-25 13:01:57 +0400
committerSergey Petrunya <psergey@askmonty.org>2014-02-25 13:01:57 +0400
commit6324c36bd703a0f55dcd49dd721af262f73cf7aa (patch)
tree32323b2c7877a77528781d30343f00618563b040 /mysql-test/r/index_merge_myisam.result
parentfb6183a80bcbb3d797583a3a38e02dc66f1ddc57 (diff)
downloadmariadb-git-6324c36bd703a0f55dcd49dd721af262f73cf7aa.tar.gz
Update test results after the previous push
Diffstat (limited to 'mysql-test/r/index_merge_myisam.result')
-rw-r--r--mysql-test/r/index_merge_myisam.result3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/index_merge_myisam.result b/mysql-test/r/index_merge_myisam.result
index 091719095fb..3d4d2dad043 100644
--- a/mysql-test/r/index_merge_myisam.result
+++ b/mysql-test/r/index_merge_myisam.result
@@ -1413,9 +1413,12 @@ pk1 pk2
explain select * from t1 where badkey=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref key1 key1 4 const 91 Using where
+set @tmp_index_merge_ror_cpk=@@optimizer_switch;
+set optimizer_switch='extended_keys=off';
explain select * from t1 where pk1 < 7500 and key1 = 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref PRIMARY,key1 key1 4 const ROWS Using where
+set optimizer_switch=@tmp_index_merge_ror_cpk;
explain select * from t1 where pktail1ok=1 and key1=10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ref key1,pktail1ok pktail1ok 4 const 76 Using where