diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-14 15:26:53 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-14 15:26:53 +0200 |
| commit | ca697d3d4054880674b86ea72ab2b6ac9cc74f0b (patch) | |
| tree | 096287f1319001d8f848ddc6a9cb64fbff9e9a5f /mysql-test/mysql-test-run.pl | |
| parent | d75f2a4a6b207e05ad0cc1db7d646945e6ee140b (diff) | |
| download | mariadb-git-ca697d3d4054880674b86ea72ab2b6ac9cc74f0b.tar.gz | |
Bug #12912120 MTR SHOULD EXPORT MYSQLD'S PATH TO TEST CASES
Export $MYSQLD as full path to executable
$MYSQLD_CMD is executable with minimum required args
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7661714eb03..148339c3890 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2130,6 +2130,12 @@ sub environment_setup { $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= mysql_fix_arguments(); $ENV{'EXE_MYSQL'}= $exe_mysql; + my $exe_mysqld= find_mysqld($basedir); + $ENV{'MYSQLD'}= $exe_mysqld; + my $extra_opts= join (" ", @opt_extra_mysqld_opt); + $ENV{'MYSQLD_CMD'}= "$exe_mysqld --defaults-group-suffix=.1 ". + "--defaults-file=$path_config_file $extra_opts"; + # ---------------------------------------------------- # bug25714 executable may _not_ exist in # some versions, test using it should be skipped |