diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-18 11:30:06 +0300 |
| commit | 3c88ce4cd112f696002d5f7461db68a3dafeb838 (patch) | |
| tree | 8860f823877b8d816fbca45d9e6926bcbc8f012d /mysql-test/main/mysqld--help.test | |
| parent | 44d06cd39df2bdde6f7ac31d5340f1f683683c99 (diff) | |
| parent | e85e4814eeca9123b23c23b40dd776416bfba2ca (diff) | |
| download | mariadb-git-3c88ce4cd112f696002d5f7461db68a3dafeb838.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.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test index f0603e4e59d..0205fa4c3de 100644 --- a/mysql-test/main/mysqld--help.test +++ b/mysql-test/main/mysqld--help.test @@ -23,7 +23,7 @@ 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 tls-version version.*/; # Plugins which may or may not be there: @plugins=qw/innodb archive blackhole federated partition s3 |