summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-08-24 22:10:48 +0300
committerSergey Petrunya <psergey@askmonty.org>2009-08-24 22:10:48 +0300
commitd294aae6c8d085f2986bf7dbbb4e0cc30b061be5 (patch)
tree800093c8df7c9ca9a0998f09465fa6076554749d /mysql-test/t
parent21d25739088a125804db1c084b91078e8ea1c5b0 (diff)
downloadmariadb-git-d294aae6c8d085f2986bf7dbbb4e0cc30b061be5.tar.gz
MWL#17: Table elimination: last fixes
- Add an @@optimizer_switch flag for table_elimination for debug build - Better comments mysql-test/t/index_merge_myisam.test: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build sql/mysql_priv.h: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build sql/mysqld.cc: MWL#17: Table elimination: last fixes - Add an @@optimizer_switch flag for table_elimination for debug build
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/index_merge_myisam.test9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/index_merge_myisam.test b/mysql-test/t/index_merge_myisam.test
index dccaecef20a..0c4b9c6886c 100644
--- a/mysql-test/t/index_merge_myisam.test
+++ b/mysql-test/t/index_merge_myisam.test
@@ -25,15 +25,19 @@ let $merge_table_support= 1;
--echo # we get another @@optimizer_switch user)
--echo #
+--replace_regex /,table_elimination=on//
select @@optimizer_switch;
set optimizer_switch='index_merge=off,index_merge_union=off';
+--replace_regex /,table_elimination=on//
select @@optimizer_switch;
set optimizer_switch='index_merge_union=on';
+--replace_regex /,table_elimination=on//
select @@optimizer_switch;
set optimizer_switch='default,index_merge_sort_union=off';
+--replace_regex /,table_elimination=on//
select @@optimizer_switch;
--error ER_WRONG_VALUE_FOR_VAR
@@ -71,17 +75,21 @@ 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';
+--replace_regex /,table_elimination=on//
select @@optimizer_switch;
set optimizer_switch=default;
# Check setting defaults for global vars
+--replace_regex /,table_elimination=on//
select @@global.optimizer_switch;
set @@global.optimizer_switch=default;
+--replace_regex /,table_elimination=on//
select @@global.optimizer_switch;
--echo #
--echo # Check index_merge's @@optimizer_switch flags
--echo #
+--replace_regex /,table_elimination.on//
select @@optimizer_switch;
create table t0 (a int);
@@ -182,6 +190,7 @@ set optimizer_switch='default,index_merge_union=off';
explain select * from t1 where a=10 and b=10 or c=10;
set optimizer_switch=default;
+--replace_regex /,table_elimination.on//
show variables like 'optimizer_switch';
drop table t0, t1;