summaryrefslogtreecommitdiff
path: root/mysql-test/t/index_merge_myisam.test
diff options
context:
space:
mode:
authorSergey Petrunia <sergefp@mysql.com>2009-03-14 21:58:23 +0300
committerSergey Petrunia <sergefp@mysql.com>2009-03-14 21:58:23 +0300
commit6551e173f9912225fca3aaada563d95aaac987f8 (patch)
treea437f0d65a729ab54271b7ff892b50751307abce /mysql-test/t/index_merge_myisam.test
parent5d55f7c5431656e279c07afa51c886079d7fd426 (diff)
downloadmariadb-git-6551e173f9912225fca3aaada563d95aaac987f8.tar.gz
@@optimizer_switch backport and change from no_xxx to xx=on|off: post-review fixes
mysql-test/r/index_merge_myisam.result: More tests mysql-test/t/index_merge_myisam.test: More tests
Diffstat (limited to 'mysql-test/t/index_merge_myisam.test')
-rw-r--r--mysql-test/t/index_merge_myisam.test19
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/t/index_merge_myisam.test b/mysql-test/t/index_merge_myisam.test
index d6945ec9cf4..dccaecef20a 100644
--- a/mysql-test/t/index_merge_myisam.test
+++ b/mysql-test/t/index_merge_myisam.test
@@ -60,6 +60,25 @@ set optimizer_switch='index_merge';
--error ER_WRONG_VALUE_FOR_VAR
set optimizer_switch='on';
+--error ER_WRONG_VALUE_FOR_VAR
+set optimizer_switch='index_merge=on,index_merge=off';
+
+--error ER_WRONG_VALUE_FOR_VAR
+set optimizer_switch='index_merge_union=on,index_merge_union=default';
+
+--error ER_WRONG_VALUE_FOR_VAR
+set optimizer_switch='default,index_merge=on,index_merge=off,default';
+
+set optimizer_switch=default;
+set optimizer_switch='index_merge=off,index_merge_union=off,default';
+select @@optimizer_switch;
+set optimizer_switch=default;
+
+# Check setting defaults for global vars
+select @@global.optimizer_switch;
+set @@global.optimizer_switch=default;
+select @@global.optimizer_switch;
+
--echo #
--echo # Check index_merge's @@optimizer_switch flags
--echo #