diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-11-17 08:00:22 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-11-17 08:00:22 -0800 |
| commit | e31887b59286ddeba161cede29a8a1c8ddba035a (patch) | |
| tree | 52785eeff274765930b9414d2cd2bb5613b151ab | |
| parent | 9cde33f9ef139f7511db66393694bbc3af6a863f (diff) | |
| parent | 6bb5bc20447d4bc54db2fdc66c4902130f18206e (diff) | |
| download | mariadb-git-e31887b59286ddeba161cede29a8a1c8ddba035a.tar.gz | |
Merge.
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1d581ac2e4e..3cd2b27d11a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -495,8 +495,8 @@ static const char *optimizer_switch_str="index_merge=on,index_merge_union=on," "mrr=off," "mrr_cost_based=off," "mrr_sort_keys=off," - "outer_join_with_cache," - "semijoin_with_cache," + "outer_join_with_cache=off," + "semijoin_with_cache=off," "join_cache_incremental=on," "join_cache_hashed=on," "join_cache_bka=on," |