diff options
| author | Sunanda Menon <sunanda.menon@oracle.com> | 2011-07-06 11:36:39 +0200 |
|---|---|---|
| committer | Sunanda Menon <sunanda.menon@oracle.com> | 2011-07-06 11:36:39 +0200 |
| commit | f094b48da4041dff886cbcaa19180e48b18813e1 (patch) | |
| tree | b620a0de6d93498520da98a4e463693e72de646f /mysql-test/mysql-test-run.pl | |
| parent | 7087c2e689fb49578ae3cac487050a05ffbf894c (diff) | |
| parent | 207eb4086263afc15e2807e344f6ce6a3bd96d27 (diff) | |
| download | mariadb-git-f094b48da4041dff886cbcaa19180e48b18813e1.tar.gz | |
Merge from mysql-5.0.94-release
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 14 |
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")) |