Fixed LP bug #891052.

Some optimizer switches were missing in the help lists of mysqld.

sql/mysqld.cc

@@ -495,6 +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,"
                                         "join_cache_incremental=on,"
                                         "join_cache_hashed=on,"
                                         "join_cache_bka=on,"
@@ -7589,7 +7591,8 @@ each time the SQL thread starts.",
    "derived_merge, derived_with_keys, "
    "firstmatch, loosescan, materialization, in_to_exists, "
    "semijoin, partial_match_rowid_merge, partial_match_table_scan, "
-   "subquery_cache, outer_join_with_cache, semijoin_with_cache, "
+   "subquery_cache, mrr, mrr_cost_based, mrr_sort_keys, "
+   "outer_join_with_cache, semijoin_with_cache, "
    "join_cache_incremental, join_cache_hashed, join_cache_bka, "
    "optimize_join_buffer_size"
    ", table_elimination"