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.test | |
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.test')
-rw-r--r-- | mysql-test/main/mysqld--help.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test index 6e5ad058330..4077cbb548e 100644 --- a/mysql-test/main/mysqld--help.test +++ b/mysql-test/main/mysqld--help.test @@ -23,7 +23,9 @@ perl; log-slow-queries pid-file slow-query-log-file log-basename datadir slave-load-tmpdir tmpdir socket thread-pool-size large-files-support lower-case-file-system system-time-zone - collation-server character-set-server log-tc-size version.*/; + collation-server character-set-server log-tc-size table-cache + table-open-cache table-open-cache-instances max-connections + version.*/; # Plugins which may or may not be there: @plugins=qw/innodb archive blackhole federated partition |