Bug#18415 known problem when mysql-test-run.pl run ActiveState perl for windows

 - Select STDOUT as default handle after having cloned the child
 - Disable check for "$error eq $output" to ptoperly redirect $error 
parent 36ae2387
...@@ -142,6 +142,7 @@ sub spawn_impl ($$$$$$$) { ...@@ -142,6 +142,7 @@ sub spawn_impl ($$$$$$$) {
if ( $pid ) if ( $pid )
{ {
select(STDOUT) if $::glob_win32_perl;
return spawn_parent_impl($pid,$mode,$path); return spawn_parent_impl($pid,$mode,$path);
} }
else else
...@@ -163,9 +164,6 @@ sub spawn_impl ($$$$$$$) { ...@@ -163,9 +164,6 @@ sub spawn_impl ($$$$$$$) {
{ {
# Don't redirect stdout on ActiveState perl since this is # Don't redirect stdout on ActiveState perl since this is
# just another thread in the same process. # just another thread in the same process.
# Should be fixed so that the thread that is created with fork
# executes the exe in another process and wait's for it to return.
# In the meanwhile, we get all the output from mysqld's to screen
} }
elsif ( ! open(STDOUT,$log_file_open_mode,$output) ) elsif ( ! open(STDOUT,$log_file_open_mode,$output) )
{ {
...@@ -175,7 +173,7 @@ sub spawn_impl ($$$$$$$) { ...@@ -175,7 +173,7 @@ sub spawn_impl ($$$$$$$) {
if ( $error ) if ( $error )
{ {
if ( $output eq $error ) if ( !$::glob_win32_perl and $output eq $error )
{ {
if ( ! open(STDERR,">&STDOUT") ) if ( ! open(STDERR,">&STDOUT") )
{ {
...@@ -184,15 +182,7 @@ sub spawn_impl ($$$$$$$) { ...@@ -184,15 +182,7 @@ sub spawn_impl ($$$$$$$) {
} }
else else
{ {
if ( $::glob_win32_perl ) if ( ! open(STDERR,$log_file_open_mode,$error) )
{
# Don't redirect stdout on ActiveState perl since this is
# just another thread in the same process.
# Should be fixed so that the thread that is created with fork
# executes the exe in another process and wait's for it to return.
# In the meanwhile, we get all the output from mysqld's to screen
}
elsif ( ! open(STDERR,$log_file_open_mode,$error) )
{ {
mtr_child_error("can't redirect STDERR to \"$error\": $!"); mtr_child_error("can't redirect STDERR to \"$error\": $!");
} }
......
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