Commit 789bbbb0 authored by Patrick Crews's avatar Patrick Crews

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
parent 7f9e0b9b
...@@ -2380,13 +2380,7 @@ sub setup_vardir() { ...@@ -2380,13 +2380,7 @@ sub setup_vardir() {
{ {
# on windows, copy all files from std_data into var/std_data_ln # on windows, copy all files from std_data into var/std_data_ln
mkpath("$opt_vardir/std_data_ln"); mkpath("$opt_vardir/std_data_ln");
opendir(DIR, "$glob_mysql_test_dir/std_data") mtr_copy_dir("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data_ln");
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);
} }
# Remove old log files # Remove old log files
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment