summaryrefslogtreecommitdiff
path: root/mysql-test/t
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/t
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/t')
-rw-r--r--mysql-test/t/range_vs_index_merge.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/range_vs_index_merge.test b/mysql-test/t/range_vs_index_merge.test
index fb8fd778559..7ecca454f4c 100644
--- a/mysql-test/t/range_vs_index_merge.test
+++ b/mysql-test/t/range_vs_index_merge.test
@@ -454,6 +454,8 @@ SELECT * FROM City WHERE Name LIKE 'Pa%';
# index merge retrievals over:
# 2. key1 and key3
# 3. key2 and key3
+set @tmp_range_vs_index_merge=@@optimizer_switch;
+set optimizer_switch='extended_keys=off';
EXPLAIN
SELECT * FROM City
@@ -578,6 +580,7 @@ SELECT * FROM City
DROP INDEX Population ON City;
DROP INDEX Name ON City;
+set optimizer_switch=@tmp_range_vs_index_merge;
# The pattern of the WHERE condition used in the following query is
# (key1|2_p1=c AND range(key1_p2)) OR (key1|2_p1=c AND range(key2_p2))