summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-08-10 21:38:55 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-08-10 21:38:55 +0300
commit1c587481966abc7a9ad5309d0a91ca920f7a5657 (patch)
tree28b936bd807cab0ba7b82e4cc9ec963fa6de6307 /mysql-test/main/mysqld--help.test
parent17be2b47ba32535e69e28da9a444e528ba8ab155 (diff)
parenteae968f62d285de97ed607c87bc131cd863d5d03 (diff)
downloadmariadb-git-1c587481966abc7a9ad5309d0a91ca920f7a5657.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/mysqld--help.test')
-rw-r--r--mysql-test/main/mysqld--help.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test
index dcca6a75bca..f32f52c6dd0 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 tls-version version.*/;
+ collation-server character-set-server log-tc-size table-cache
+ table-open-cache table-open-cache-instances max-connections
+ tls-version version.*/;
# Plugins which may or may not be there:
@plugins=qw/innodb archive blackhole federated partition s3