diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2009-03-10 11:49:30 +0300 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2009-03-10 11:49:30 +0300 |
| commit | 989ee96b64b9eb510a62857c0ca7ef7dbdf28f2b (patch) | |
| tree | a297e86e0dbee6b5c4d10d315e57ef5af382b4e8 /sql/mysqld.cc | |
| parent | 632a33f8fcc05ad5abcd2012eeaab6099f44c385 (diff) | |
| download | mariadb-git-989ee96b64b9eb510a62857c0ca7ef7dbdf28f2b.tar.gz | |
Post-merge fixes
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 4 insertions, 1 deletions
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: |