MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:June 15 2007 3:42pm
Subject:bk commit into 5.0 tree (msvensson:1.2531) BUG#18415
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-15 17:42:03+02:00, msvensson@pilot.(none) +1 -0
  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 

  mysql-test/lib/mtr_process.pl@stripped, 2007-06-15 17:42:02+02:00, msvensson@pilot.(none) +3 -13
    Restore output to STDOUT after forking the child
    Since STDOUT is not redirected disable to check to see if $output
    is equal to $error so STDERR is properly opened to $error 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.(none)
# Root:	/data/msvensson/mysql/bug18415/my50-bug18415

--- 1.56/mysql-test/lib/mtr_process.pl	2007-04-23 11:03:39 +02:00
+++ 1.57/mysql-test/lib/mtr_process.pl	2007-06-15 17:42:02 +02:00
@@ -142,6 +142,7 @@ sub spawn_impl ($$$$$$$) {
 
     if ( $pid )
     {
+      select(STDOUT) if $::glob_win32_perl;
       return spawn_parent_impl($pid,$mode,$path);
     }
     else
@@ -163,9 +164,6 @@ sub spawn_impl ($$$$$$$) {
 	{
 	  # 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(STDOUT,$log_file_open_mode,$output) )
         {
@@ -175,7 +173,7 @@ sub spawn_impl ($$$$$$$) {
 
       if ( $error )
       {
-        if ( $output eq $error )
+        if ( !$::glob_win32_perl and $output eq $error )
         {
           if ( ! open(STDERR,">&STDOUT") )
           {
@@ -184,15 +182,7 @@ sub spawn_impl ($$$$$$$) {
         }
         else
         {
-	  if ( $::glob_win32_perl )
-	  {
-	    # 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) )
+          if ( ! open(STDERR,$log_file_open_mode,$error) )
           {
             mtr_child_error("can't redirect STDERR to \"$error\": $!");
           }
Thread
bk commit into 5.0 tree (msvensson:1.2531) BUG#18415msvensson15 Jun