diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2008-12-05 08:21:03 -0500 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2008-12-05 08:21:03 -0500 |
| commit | 789bbbb037756bba47c6306228bf9b7d80cafb24 (patch) | |
| tree | 5e7efd737c4f87e7f20c2e155c6c2c7b5243617d /mysql-test | |
| parent | 7f9e0b9bfb71bd3e47c48bb77f11df76feb1b7ad (diff) | |
| download | mariadb-git-789bbbb037756bba47c6306228bf9b7d80cafb24.tar.gz | |
Bug#41258: mysql-test-run does not copy subdirectories of std_data on Windows (5.0 only)
Altered how we copy data from mysql-test/std_data on Windows to match what we are doing in 5.1 and 6.0
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 268dd3fbd16..70637034b6e 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2380,13 +2380,7 @@ sub setup_vardir() { { # on windows, copy all files from std_data into var/std_data_ln mkpath("$opt_vardir/std_data_ln"); - opendir(DIR, "$glob_mysql_test_dir/std_data") - or mtr_error("Can't find the std_data directory: $!"); - for(readdir(DIR)) { - next if -d "$glob_mysql_test_dir/std_data/$_"; - copy("$glob_mysql_test_dir/std_data/$_", "$opt_vardir/std_data_ln/$_"); - } - closedir(DIR); + mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln"); } # Remove old log files |