summaryrefslogtreecommitdiff
path: root/mysql-test/t/myisam_icp.test
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-10-28 12:38:36 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-10-28 12:38:36 +0400
commit3694bb90a47feb463c5a38543650f0f53d1735eb (patch)
tree4d837b60568d365e3497ceff7c3372854c90db88 /mysql-test/t/myisam_icp.test
parent363094f6e71ac7f3f76c1d1a9d07da9cc5a9431b (diff)
downloadmariadb-git-3694bb90a47feb463c5a38543650f0f53d1735eb.tar.gz
- Let t/myisam_icp.test run include/icp_tests.inc with MRR/ICP turned ON (not OFF)
- Fix the compile-time-default value of optimizer_switch printed by mysqld --help --defaults
Diffstat (limited to 'mysql-test/t/myisam_icp.test')
-rw-r--r--mysql-test/t/myisam_icp.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/myisam_icp.test b/mysql-test/t/myisam_icp.test
index 7bb984d815a..7e7affb1b8f 100644
--- a/mysql-test/t/myisam_icp.test
+++ b/mysql-test/t/myisam_icp.test
@@ -2,11 +2,11 @@
# ICP/MyISAM tests (Index Condition Pushdown)
#
---source include/icp_tests.inc
-
set @myisam_icp_tmp=@@optimizer_switch;
set optimizer_switch='mrr=on,mrr_sort_keys=on,index_condition_pushdown=on';
+--source include/icp_tests.inc
+
--disable_warnings
drop table if exists t0, t1, t1i, t1m;
--enable_warnings