diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
| commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
| tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /mysql-test/mysql-test-run.pl | |
| parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
| parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
| download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 69ab23c6f40..6f9481c7491 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3222,13 +3222,10 @@ sub mysql_server_start($) { if (! $opt_start_dirty) # If dirty, keep possibly grown system db { # Copy datadir from installed system db - for my $path ( "$opt_vardir", "$opt_vardir/..") { - my $install_db= "$path/install.db"; - copytree($install_db, $datadir) - if -d $install_db; - } - mtr_error("Failed to copy system db to '$datadir'") - unless -d $datadir; + my $path= ($opt_parallel == 1) ? "$opt_vardir" : "$opt_vardir/.."; + my $install_db= "$path/install.db"; + copytree($install_db, $datadir) if -d $install_db; + mtr_error("Failed to copy system db to '$datadir'") unless -d $datadir; } } else |