summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-06 17:16:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-06 17:16:40 +0300
commit4081b7b27a40df6244e0525885cf70e48b7b35bc (patch)
treee9e6199730603d05090e0550e023e92c7a32f88d /mysql-test/main/mysqld--help.test
parent780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (diff)
parent244f0e6dd815b388282c15db4fe7f15533f4c8fc (diff)
downloadmariadb-git-4081b7b27a40df6244e0525885cf70e48b7b35bc.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.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test
index 846d3abf3e4..dcca6a75bca 100644
--- a/mysql-test/main/mysqld--help.test
+++ b/mysql-test/main/mysqld--help.test
@@ -30,7 +30,7 @@ perl;
feedback debug temp-pool ssl des-key-file xtradb sequence
thread-concurrency super-large-pages mutex-deadlock-detector
connect null-audit aria oqgraph sphinx thread-handling
- test-sql-discovery query-cache-info in-predicate-conversion-threshold
+ test-sql-discovery query-cache-info
query-response-time metadata-lock-info locales unix-socket
wsrep file-key-management cracklib-password-check user-variables
thread-pool-groups thread-pool-queues thread-pool-stats thread-pool-waits/;