summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormsvensson@pilot.(none) <>2007-08-29 17:54:40 +0200
committermsvensson@pilot.(none) <>2007-08-29 17:54:40 +0200
commit50320790d563df018edf3b687a9b72b2a8e0441e (patch)
treed3143db2e34b15b4269ab65b42fc14af273949da /mysql-test
parentd3d25d114a475972263bc7431157b255e3909860 (diff)
parentb1fdece3078398ef669cf1d0151ec8c76cf11261 (diff)
downloadmariadb-git-50320790d563df018edf3b687a9b72b2a8e0441e.tar.gz
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
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 1fec717c6a3..f84da1ed132 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4032,6 +4032,9 @@ sub mysqld_start ($$$) {
$wait_for_pid_file= 0;
}
+ # Remove the pidfile
+ unlink($mysqld->{'path_pid'});
+
if ( defined $exe )
{
$pid= mtr_spawn($exe, $args, "",