diff options
| author | Sergei Golubchik <serg@mysql.com> | 2009-12-24 12:30:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2009-12-24 12:30:23 +0100 |
| commit | 025d86a60a9c797b689b3d3a2b1c626bd3d7f5f3 (patch) | |
| tree | 946ea113291960b21c67277e4da4851dee1bee7b /mysql-test/include/mysqld--help.inc | |
| parent | 5b9ed28575e88835209256f66113cba9a0db9d0b (diff) | |
| download | mariadb-git-025d86a60a9c797b689b3d3a2b1c626bd3d7f5f3.tar.gz | |
slightly more complete mysqld--help test
Diffstat (limited to 'mysql-test/include/mysqld--help.inc')
| -rw-r--r-- | mysql-test/include/mysqld--help.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/include/mysqld--help.inc b/mysql-test/include/mysqld--help.inc index 11945e6606a..25d0068cec0 100644 --- a/mysql-test/include/mysqld--help.inc +++ b/mysql-test/include/mysqld--help.inc @@ -10,12 +10,11 @@ exec $MYSQLD_BOOTSTRAP_CMD --symbolic-links=0 --lower-case-table-names=1 --help --verbose > $MYSQL_TMP_DIR/mysqld--help.txt 2>&1; perl; - @skipvars=qw/basedir character-sets-dir datadir - general-log-file language lc-messages-dir - log log-slow-queries pid-file plugin-dir slave-load-tmpdir - slow-query-log-file tmpdir open-files-limit/; + @skipvars=qw/basedir open-files-limit general-log-file log + log-slow-queries pid-file slow-query-log-file/; @plugins=qw/innodb ndb ndbcluster safemalloc debug temp-pool - thread-concurrency super-large-pages/; + thread-concurrency super-large-pages mutex-deadlock-detector/; + @env=qw/MYSQLTEST_VARDIR MYSQL_TEST_DIR MYSQL_LIBDIR MYSQL_SHAREDIR/; $re1=join('|', @skipvars, @plugins); $re2=join('|', @plugins); $skip=0; @@ -27,9 +26,11 @@ perl; $skip=0 if /^ -/; $skip=1 if / --($re2)\b/; # fixes for 32-bit + y!\\!/!; s/\b4294967295\b/18446744073709551615/; s/\b2146435072\b/9223372036853727232/; s/\b196608\b/262144/; + foreach $var (@env) { s/$ENV{$var}/$var/ } next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again next if $skip; print; |