diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 18:40:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-10 18:40:57 +0300 |
| commit | bafc5c1321a7dff5f2da292111bf98fed9d1658d (patch) | |
| tree | b674bceb1f1fe8b2dc9a8fb7c1aeca6fd1b95dde /mysql-test/main/mysqld--help.result | |
| parent | 0025eb3f963fdca88028ff14a27d9b9638079337 (diff) | |
| parent | 3b6dadb5ebedab71bf1870579745ff3cd05e498a (diff) | |
| download | mariadb-git-bafc5c1321a7dff5f2da292111bf98fed9d1658d.tar.gz | |
Merge 10.2 into 10.3
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 dcfbc2cd65d..54389a78f73 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1499,7 +1499,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 @@ -1686,10 +1685,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 |