database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2017-08-30 13:06:13 +03:00
parent 4c91fd4cd6 eb389d5c39
commit 829752973b
49 changed files with 7442 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqld--help.result
View File

@ -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