summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-02-25 01:18:13 +0400
committerSergey Petrunya <psergey@askmonty.org>2014-02-25 01:18:13 +0400
commitfb6183a80bcbb3d797583a3a38e02dc66f1ddc57 (patch)
treebe60c85082bef8171c306d28aec06203cc3cf1c9 /mysql-test/include
parent2f22e85d05d5dcc6c5552e76d7f735031a706802 (diff)
downloadmariadb-git-fb6183a80bcbb3d797583a3a38e02dc66f1ddc57.tar.gz
MDEV-5244: Make extended_keys=ON by default in 10.0
- Change the default flag value to ON. - Update the testcases to be run extended_keys=ON: = trivial test result updates = If extended_keys setting makes a difference for a testcase, run the testcase with extended_keys=off. There were only a few such cases - Update to vcol_select_innodb looks like a worse plan but it will be gone in 10.0.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/index_merge_ror_cpk.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge_ror_cpk.inc b/mysql-test/include/index_merge_ror_cpk.inc
index 3912aa34026..df42745b4fc 100644
--- a/mysql-test/include/index_merge_ror_cpk.inc
+++ b/mysql-test/include/index_merge_ror_cpk.inc
@@ -79,8 +79,11 @@ select pk1,pk2 from t1 where key1 = 10 and key2=10 and 2*pk1+1 < 2*96+1;
# Verify that CPK is always used for index intersection scans
# (this is because it is used as a filter, not for retrieval)
explain select * from t1 where badkey=1 and key1=10;
+set @tmp_index_merge_ror_cpk=@@optimizer_switch;
+set optimizer_switch='extended_keys=off';
--replace_column 9 ROWS
explain select * from t1 where pk1 < 7500 and key1 = 10;
+set optimizer_switch=@tmp_index_merge_ror_cpk;
# Verify that keys with 'tails' of PK members are ok.
explain select * from t1 where pktail1ok=1 and key1=10;