diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-12 19:21:42 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-12 19:21:42 +0300 |
| commit | 357496c091991d5f22f2b06429757415841fb76b (patch) | |
| tree | 5e3f2c3f7e7cf17409629a8cac1e53ee26fff019 /mysql-test/include/mysqld--help.inc | |
| parent | a4c3bc618bb83884a19dc157bc56d4e3d2432c22 (diff) | |
| parent | ba3b5a7eb660c7172da1cb4bf64abb9e9a2e0603 (diff) | |
| download | mariadb-git-357496c091991d5f22f2b06429757415841fb76b.tar.gz | |
Auto-merge from mysql-next-mr-bugfixing.
Diffstat (limited to 'mysql-test/include/mysqld--help.inc')
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index 82bf65bc362..3c8d19107c9 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 - 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 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_SHAREDIR/; |