diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:38:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 21:38:55 +0300 |
| commit | 1c587481966abc7a9ad5309d0a91ca920f7a5657 (patch) | |
| tree | 28b936bd807cab0ba7b82e4cc9ec963fa6de6307 /mysql-test/main/mysqld--help.result | |
| parent | 17be2b47ba32535e69e28da9a444e528ba8ab155 (diff) | |
| parent | eae968f62d285de97ed607c87bc131cd863d5d03 (diff) | |
| download | mariadb-git-1c587481966abc7a9ad5309d0a91ca920f7a5657.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
| -rw-r--r-- | mysql-test/main/mysqld--help.result | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index e9ea7e13c99..7671dfeef59 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1594,7 +1594,6 @@ max-binlog-cache-size 18446744073709547520 max-binlog-size 1073741824 max-binlog-stmt-cache-size 18446744073709547520 max-connect-errors 100 -max-connections 151 max-delayed-threads 20 max-digest-length 1024 max-error-count 64 @@ -1797,10 +1796,7 @@ sync-relay-log 10000 sync-relay-log-info 10000 sysdate-is-now FALSE system-versioning-alter-history ERROR -table-cache 421 table-definition-cache 400 -table-open-cache 421 -table-open-cache-instances 1 tc-heuristic-recover OFF tcp-keepalive-interval 0 tcp-keepalive-probes 0 |