diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-01-14 14:21:46 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-01-14 14:21:46 +0100 |
| commit | 745a9f92ec7feb22071d5c867b020fb0fcd0251e (patch) | |
| tree | bc637399c7e991ae74368ddb46ed5961d5067a94 /sql/mysqld.h | |
| parent | c1b186f945ee4bb7151d72f2be9665f886a9f847 (diff) | |
| download | mariadb-git-745a9f92ec7feb22071d5c867b020fb0fcd0251e.tar.gz | |
Fix for BUG#59432 "--autocommit=on does not work (@@global.autocommit is 0)"
mysql-test/r/mysqld--help-notwin.result:
consequence of introducing opt_autocommit and its default
mysql-test/suite/sys_vars/r/autocommit_func4.result:
Before this fix, this test would have shown @@global.autocommit == 0
in spite of --autocommit=on.
mysql-test/suite/sys_vars/r/autocommit_func5.result:
result unchanged by the fix
sql/mysqld.cc:
atoi(argument) was reliable for =0|1 parameters. Now that boolean options
must support =on/off/true/false, atoi(argument) is wrong (being always 0
for those strings). Instead, let the internal logic of my_getopt
(in particular get_bool_argument()) set a boolean opt_autocommit
properly, and use that to set global_system_variables.option_bits.
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index 9218503d477..2099e57e96d 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -394,8 +394,7 @@ enum options_mysqld OPT_UPDATE_LOG, OPT_WANT_CORE, OPT_ENGINE_CONDITION_PUSHDOWN, - OPT_LOG_ERROR, - OPT_AUTOCOMMIT + OPT_LOG_ERROR }; |