diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 16:38:05 +0200 |
| commit | 932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch) | |
| tree | 5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /mysql-test/r/mysqld--help,win.rdiff | |
| parent | 0bb30f3603b519780eaf3fe0527b1c6af285229a (diff) | |
| parent | 33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff) | |
| download | mariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/r/mysqld--help,win.rdiff')
| -rw-r--r-- | mysql-test/r/mysqld--help,win.rdiff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff index a3bf5c55ee8..ecbe1843877 100644 --- a/mysql-test/r/mysqld--help,win.rdiff +++ b/mysql-test/r/mysqld--help,win.rdiff @@ -126,7 +126,7 @@ table-definition-cache 400 -table-open-cache 431 +table-open-cache 2000 - tc-heuristic-recover COMMIT + tc-heuristic-recover OFF thread-cache-size 151 -thread-pool-idle-timeout 60 thread-pool-max-threads 1000 |