diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-25 10:24:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-25 10:24:14 +0200 |
| commit | 9554342d16a6567329cf6269129f9db4ea0be8c7 (patch) | |
| tree | 09b948047b1b95ea4d964857cc09a33ba8fa835f /mysql-test/r/mysqld--help.result | |
| parent | 5448df084b885ab744711888037bcc83bc2545f0 (diff) | |
| parent | 4070ce00dc95e320c68e9d9b623893b034fb913e (diff) | |
| download | mariadb-git-9554342d16a6567329cf6269129f9db4ea0be8c7.tar.gz | |
Merge branch '10.1' into pull-request-97
Merge downstream Debian packaging (MDEV-6284)
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index e429bff03e4..1ed098ec12a 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -197,6 +197,11 @@ The following options may be given as the first argument: If non-zero, binary logs will be purged after expire_logs_days days; possible purges happen at startup and at binary log rotation + --explicit-defaults-for-timestamp + This option causes CREATE TABLE to create all TIMESTAMP + columns as NULL with DEFAULT NULL attribute, Without this + option, TIMESTAMP columns are NOT NULL and have implicit + DEFAULT clauses. The old behavior is deprecated. --external-locking Use system (external) locking (disabled by default). With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running. @@ -1179,6 +1184,7 @@ enforce-storage-engine (No default value) event-scheduler OFF expensive-subquery-limit 100 expire-logs-days 0 +explicit-defaults-for-timestamp FALSE external-locking FALSE extra-max-connections 1 extra-port 0 |