diff options
author | unknown <sanja@askmonty.org> | 2011-10-10 23:34:32 +0300 |
---|---|---|
committer | unknown <sanja@askmonty.org> | 2011-10-10 23:34:32 +0300 |
commit | daf52954a88ca9a67e9d08967d369d57b12dc843 (patch) | |
tree | 8439893ff1878a0c805ba4a7467ecc1b85ab6d66 /sql/mysqld.cc | |
parent | 298fc11b820b3e654bfc65f84fe4947e800564d0 (diff) | |
parent | 54caeee5d6bc06be4cc451aef49ee0a4f7655ce2 (diff) | |
download | mariadb-git-daf52954a88ca9a67e9d08967d369d57b12dc843.tar.gz |
Merge
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2038d57faf5..9d87864d939 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=off," + "subquery_cache=on," "mrr=off," "mrr_cost_based=off," "mrr_sort_keys=off," |