summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-02-10 11:00:16 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2009-02-10 11:00:16 +0100
commit46f91045f8e87434f84b2b268f29f54adcb344eb (patch)
tree3baf3b36f9623b2bf8e3221baaab2fe55b0eff6b
parent8a98664d3b825f7d98d7acd8372079fc6224dfcb (diff)
downloadmariadb-git-46f91045f8e87434f84b2b268f29f54adcb344eb.tar.gz
Bug #42590 MTR v1 crashes under Active State Perl
Perl crashes when MTR 2 tries to start v1 Replaced require with system()
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 511cd4d07ba..ba426446075 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -45,8 +45,8 @@ BEGIN {
print "=======================================================\n";
print " WARNING: Using mysql-test-run.pl version 1! \n";
print "=======================================================\n";
- require "lib/v1/mysql-test-run.pl";
- exit(1);
+ # Should use exec() here on *nix but this appears not to work on Windows
+ exit(system($^X, "lib/v1/mysql-test-run.pl", @ARGV) >> 8);
}
elsif ( $version == 2 )
{