bzr commit into mysql-6.0-bugteam branch (sergefp:3148)

[Sergey Petrunia]

#At file:///home/spetrunia/dev/mysql-6.0-bugteam-merge/ based on revid:azundris@stripped

 3148 Sergey Petrunia	2009-03-21
      Fix 5.1->6.0 merge error: correct value for optimizer_switch_str
modified:
  sql/mysqld.cc

per-file messages:
  sql/mysqld.cc
    Fix 5.1->6.0 merge error: correct value for optimizer_switch_str
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-03-19 17:03:58 +0000
+++ b/sql/mysqld.cc	2009-03-21 19:05:15 +0000
@@ -421,9 +421,14 @@ static ulong max_used_connections;
 static volatile ulong cached_thread_count= 0;
 static const char *sql_mode_str= "OFF";
 /* Text representation for OPTIMIZER_SWITCH_DEFAULT */
-static const char *optimizer_switch_str="index_merge=on,index_merge_union=on,"
+static const char *optimizer_switch_str="firstmatch=on,"
+                                        "index_merge=on,"
+                                        "index_merge_union=on,"
                                         "index_merge_sort_union=on,"
-                                        "index_merge_intersection=on";
+                                        "index_merge_intersection=on,"
+                                        "loosescan=on,"
+                                        "materialization=on,"
+                                        "semijoin=on";
 static char *mysqld_user, *mysqld_chroot, *log_error_file_ptr;
 static char *opt_init_slave, *language_ptr, *opt_init_connect;
 static char *default_character_set_name;