diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-30 13:06:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-30 13:06:13 +0300 |
| commit | 829752973bd67bc4aaa9acf27dbc4715b62ade23 (patch) | |
| tree | b02e0d09d42406b62495a0cab3d0d33be56e84cd /mysql-test/r/mysqld--help.result | |
| parent | 4c91fd4cd62e3cfa8949d4f6265c79943390b2d2 (diff) | |
| parent | eb389d5c390969b17d433d7a8710d87aa8b55a5f (diff) | |
| download | mariadb-git-829752973bd67bc4aaa9acf27dbc4715b62ade23.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index f9aa90ab0ab..e84921bfa0a 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1177,7 +1177,7 @@ character-sets-dir MYSQL_CHARSETSDIR/ chroot (No default value) completion-type NO_CHAIN concurrent-insert AUTO -console FALSE +console TRUE date-format %Y-%m-%d datetime-format %Y-%m-%d %H:%i:%s deadlock-search-depth-long 15 |