summaryrefslogtreecommitdiff
path: root/mysql-test/include/mysqld--help.inc
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-01-13 21:14:42 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-01-13 21:14:42 +0100
commitb84abb3c4027ba98a20a64e15fe7865cf26ed3c8 (patch)
treed78e7b24a61727ddcb8b67fbe52760b1e5ecd95a /mysql-test/include/mysqld--help.inc
parentf3460b21323e359d7f3da1ec434260223cffa77a (diff)
parent51caeae915d3a5add57a785e69b7ce52cac084ad (diff)
downloadmariadb-git-b84abb3c4027ba98a20a64e15fe7865cf26ed3c8.tar.gz
merge
Diffstat (limited to 'mysql-test/include/mysqld--help.inc')
-rw-r--r--mysql-test/include/mysqld--help.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc
index ad5272c095e..e40e2a62a74 100644
--- a/mysql-test/include/mysqld--help.inc
+++ b/mysql-test/include/mysqld--help.inc
@@ -11,7 +11,8 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help
perl;
@skipvars=qw/basedir open-files-limit general-log-file log plugin-dir
- log-slow-queries pid-file slow-query-log-file/;
+ log-slow-queries pid-file slow-query-log-file
+ datadir slave-load-tmpdir tmpdir/;
@plugins=qw/innodb ndb archive blackhole federated partition ndbcluster safemalloc debug temp-pool ssl des-key-file
thread-concurrency super-large-pages mutex-deadlock-detector/;
@env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_CHARSETSDIR MYSQL_SHAREDIR /;