Post-merge fixes

989ee96b · Sergey Petrunia · 632a33f8 · 989ee96b
Commit 989ee96b authored Mar 10, 2009 by Sergey Petrunia
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

sql/mysqld.cc sql/mysqld.cc +4 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8254,7 +8254,10 @@ mysqld_get_one_option(int optid,
  {
    optimizer_switch_str= argument;
    global_system_variables.optimizer_switch=
-      find_bit_type_or_exit(argument, &optimizer_switch_typelib, opt->name);
+      find_bit_type_or_exit(argument, &optimizer_switch_typelib, opt->name, 
+                            &error);
+    if (error)
+      return 1;
    break;
  }
  case OPT_ONE_THREAD: