Merge.

e31887b5 · Igor Babaev · 9cde33f9 · 6bb5bc20 · e31887b5
Commit e31887b5 authored Nov 17, 2011 by Igor Babaev
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/mysqld.cc sql/mysqld.cc +2 -2

No files found.
--- 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,"