summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-08-29 17:54:16 +0200
committerunknown <msvensson@pilot.(none)>2007-08-29 17:54:16 +0200
commit7cafddc3454e60a95ef1f7059d3b5954a1e4d1b6 (patch)
treee6de67cd484492774f7cd48930e30a628e4b031d /mysql-test
parent2e4963c5b663768f0d928b9d11dcd9567cca2ad9 (diff)
parent10012b36feb18180892201b4afdd995e9e0f1a0a (diff)
downloadmariadb-git-7cafddc3454e60a95ef1f7059d3b5954a1e4d1b6.tar.gz
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint mysql-test/mysql-test-run.pl: Auto merged
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index af61e1e1135..06447b9e69d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3996,6 +3996,9 @@ sub mysqld_start ($$$) {
$wait_for_pid_file= 0;
}
+ # Remove the pidfile
+ unlink($mysqld->{'path_pid'});
+
if ( defined $exe )
{
$pid= mtr_spawn($exe, $args, "",