diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 18:06:55 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
commit | bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c (patch) | |
tree | ed6ce95f6ee9ff57b45c494d10f5a19473237e96 /mysql-test/r/mysqld--help.result | |
parent | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (diff) | |
download | mariadb-git-bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c.tar.gz |
MDEV-6066: Merge new defaults from 5.6 and 5.7
cosmetic fixes. test fixes.
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r-- | mysql-test/r/mysqld--help.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 0c92b7785f1..d6371a45f86 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1415,9 +1415,9 @@ sync-master-info 10000 sync-relay-log 10000 sync-relay-log-info 10000 sysdate-is-now FALSE -table-cache 2000 +table-cache 431 table-definition-cache 400 -table-open-cache 2000 +table-open-cache 431 tc-heuristic-recover COMMIT thread-cache-size 0 thread-pool-idle-timeout 60 |