diff options
| author | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-01-20 18:35:57 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-01-20 18:35:57 +0100 |
| commit | 3729fb5f7b534dec3482e5a771b73f43c12e3bec (patch) | |
| tree | a1c0b7bc3b8449e48d210fab73769316ee296d5c /mysql-test/r/mysqld--help-notwin.result | |
| parent | 4e4081bb40c2c38bff131c3f4f0dbf7374bc580b (diff) | |
| parent | 921dcabe90a0f894f053ce9e184fd4f8c8f2c249 (diff) | |
| download | mariadb-git-3729fb5f7b534dec3482e5a771b73f43c12e3bec.tar.gz | |
merge
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-notwin.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result index 60ba06c8f7e..6659a291e0b 100644 --- a/mysql-test/r/mysqld--help-notwin.result +++ b/mysql-test/r/mysqld--help-notwin.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.) @@ -732,6 +733,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 |