From dc84df673146a7d7870262185c40bd004f695d3d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 15 Jul 2011 11:36:36 +0300 Subject: Make subquery cache off by default. mysql-test/r/subselect_scache.result: Test with subquery cache on. mysql-test/t/subselect_scache.test: Test with subquery cache on. --- sql/mysql_priv.h | 1 - sql/mysqld.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'sql') diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 0d6cb60b842..a337ba654c6 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -610,7 +610,6 @@ enabled by default, add OPTIMIZER_SWITCH_MATERIALIZATION OPTIMIZER_SWITCH_IN_TO_EXISTS | \ OPTIMIZER_SWITCH_PARTIAL_MATCH_ROWID_MERGE|\ OPTIMIZER_SWITCH_PARTIAL_MATCH_TABLE_SCAN|\ - OPTIMIZER_SWITCH_SUBQUERY_CACHE|\ OPTIMIZER_SWITCH_JOIN_CACHE_INCREMENTAL | \ OPTIMIZER_SWITCH_JOIN_CACHE_HASHED | \ OPTIMIZER_SWITCH_JOIN_CACHE_BKA | \ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b297a611633..dc52efe426b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -491,7 +491,7 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," "semijoin=off," "partial_match_rowid_merge=on," "partial_match_table_scan=on," - "subquery_cache=on," + "subquery_cache=off," "mrr=off," "mrr_cost_based=off," "mrr_sort_keys=off," -- cgit v1.2.1