summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorSunanda Menon <sunanda.menon@oracle.com>2011-07-06 11:36:39 +0200
committerSunanda Menon <sunanda.menon@oracle.com>2011-07-06 11:36:39 +0200
commitaf6ddeca48227198e420e3e3704a856d013c7ec7 (patch)
treeb620a0de6d93498520da98a4e463693e72de646f /mysql-test/mysql-test-run.pl
parentbb3723835e3b141cc835ea9f2eb3cbf069855104 (diff)
parent51e1713a5d5d968d922612141eec3208c086d878 (diff)
downloadmariadb-git-af6ddeca48227198e420e3e3704a856d013c7ec7.tar.gz
Merge from mysql-5.0.94-release
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl14
1 files changed, 3 insertions, 11 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ad2eebbe42e..97ecefe77fa 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2412,17 +2412,9 @@ sub setup_vardir() {
mkpath("$data_dir/test");
}
- # Make a link std_data_ln in var/ that points to std_data
- if ( ! $glob_win32 )
- {
- symlink("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
- }
- else
- {
- # on windows, copy all files from std_data into var/std_data_ln
- mkpath("$opt_vardir/std_data_ln");
- mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
- }
+ # copy all files from std_data into var/std_data_ln
+ mkpath("$opt_vardir/std_data_ln");
+ mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
# Remove old log files
foreach my $name (glob("r/*.progress r/*.log r/*.warnings"))