summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-win.result
diff options
context:
space:
mode:
authorGuilhem Bichot <guilhem.bichot@oracle.com>2011-01-14 14:21:46 +0100
committerGuilhem Bichot <guilhem.bichot@oracle.com>2011-01-14 14:21:46 +0100
commit745a9f92ec7feb22071d5c867b020fb0fcd0251e (patch)
treebc637399c7e991ae74368ddb46ed5961d5067a94 /mysql-test/r/mysqld--help-win.result
parentc1b186f945ee4bb7151d72f2be9665f886a9f847 (diff)
downloadmariadb-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 'mysql-test/r/mysqld--help-win.result')
-rw-r--r--mysql-test/r/mysqld--help-win.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index dfb53937245..240c29294e2 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -20,6 +20,7 @@ The following options may be given as the first argument:
Offset added to Auto-increment columns. Used when
auto-increment-increment != 1
--autocommit Set default value for autocommit (0 or 1)
+ (Defaults to on; use --skip-autocommit to disable.)
--automatic-sp-privileges
Creating and dropping stored procedures alters ACLs
(Defaults to on; use --skip-automatic-sp-privileges to disable.)
@@ -736,6 +737,7 @@ abort-slave-event-count 0
allow-suspicious-udfs FALSE
auto-increment-increment 1
auto-increment-offset 1
+autocommit TRUE
automatic-sp-privileges TRUE
back-log 50
big-tables FALSE