diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysql_priv.h | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e4bb0a670fb..68184a94666 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 0cd0e560730..f6cbf581627 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," |