From 989ee96b64b9eb510a62857c0ca7ef7dbdf28f2b Mon Sep 17 00:00:00 2001
From: Sergey Petrunia <sergefp@mysql.com>
Date: Tue, 10 Mar 2009 11:49:30 +0300
Subject: [PATCH] Post-merge fixes

---
 sql/mysqld.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 199d5ba1073..5fdcd04de87 100644
--- 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: