diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-04-30 07:45:56 -0700 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-04-30 07:45:56 -0700 |
| commit | 81c32c1e7015ef5bd232d1443b0e74ce93445f4f (patch) | |
| tree | a62f9eee79015c377e86ca87adefa24c61a2b9b6 /mysql-test/mysql-test-run.pl | |
| parent | 84c0830bef22b9626feab53897ea493f1cc36f92 (diff) | |
| download | mariadb-git-81c32c1e7015ef5bd232d1443b0e74ce93445f4f.tar.gz | |
mysql-test/mysql-test-run.pl: another mysqld --help fix
scripts/mysql_install_db.sh: don't fail if --skip-XXX is not recognized
mysql-test/mysql-test-run.pl:
another mysqld --help fix
scripts/mysql_install_db.sh:
don't fail if --skip-XXX is not recognized
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 1096123bf47..f3c6e62819d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1361,10 +1361,9 @@ sub collect_mysqld_features () { # --no-defaults and --skip-grant-tables are to avoid loading # system-wide configs and plugins # - # --datadir - for lowercase test to work + # --datadir must exist, mysqld will chdir into it # - my $tmp_datadir=$opt_vardir || $default_vardir; - my $list= `$exe_mysqld --no-defaults --datadir=$tmp_datadir --language=$path_language --skip-grant-tables --verbose --help`; + my $list= `$exe_mysqld --no-defaults --datadir=$path_language --language=$path_language --skip-grant-tables --verbose --help`; foreach my $line (split('\n', $list)) { |