summaryrefslogtreecommitdiff
path: root/sql
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 /sql
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 'sql')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 57c2fa42ab8..a7199a4af2a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -481,7 +481,7 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on,"
"index_merge_sort_union=on,"
"index_merge_intersection=on,"
"index_merge_sort_intersection=off,"
- "index_condition_pushdown=on,"
+ "index_condition_pushdown=off,"
"derived_merge=off,"
"derived_with_keys=off,"
"firstmatch=off,"