From 7cfc7d7265de43ef3dd21fd86d64ae5bed1f5e2c Mon Sep 17 00:00:00 2001 From: Tor Didriksen Date: Thu, 3 Jun 2010 09:52:15 +0200 Subject: [PATCH] Skip perfschema.misc if "var" is a symlink (due to Bug 51447). mysql-test/include/not_var_link.inc: Chop off /$child_num before testing if "var" is a symlink --- mysql-test/include/not_var_link.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/not_var_link.inc b/mysql-test/include/not_var_link.inc index 96db4f1dfd5..e1eb1dff2d7 100644 --- a/mysql-test/include/not_var_link.inc +++ b/mysql-test/include/not_var_link.inc @@ -1,6 +1,11 @@ +# Test if MYSQLTEST_VARDIR is a soft link +# If we run in parallel, we have a suffix "/$child_num", so chop off that. + perl; + my $path= $ENV{'MYSQLTEST_VARDIR'}; + $path=~ s|/\d+$||; open (ISLINK, ">" . $ENV{'MYSQL_TMP_DIR'} . "/mtr_var_link"); - my $mvr= -l $ENV{'MYSQLTEST_VARDIR'} ? 1 : 0; + my $mvr= -l $path ? 1 : 0; print ISLINK "let \$mtr_var_link= $mvr;\n"; close ISLINK; EOF