bk commit into 6.0 tree (davi:1.2624)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi 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, 2008-04-22 19:55:20-03:00, davi@stripped +1 -0
  The problem is that due to a spurious semicolon the pipe
  creation code was not setting the non-blocking flag for the
  write end of a pipe.

  sql/scheduler.cc@stripped, 2008-04-22 19:55:17-03:00, davi@stripped +1 -1
    Remove spurious semicolon otherwise the proceeding won't execute.

diff -Nrup a/sql/scheduler.cc b/sql/scheduler.cc
--- a/sql/scheduler.cc	2008-03-26 11:30:22 -03:00
+++ b/sql/scheduler.cc	2008-04-22 19:55:17 -03:00
@@ -135,7 +135,7 @@ static bool init_pipe(int pipe_fds[])
   int flags;
   return pipe(pipe_fds) < 0 ||
           (flags= fcntl(pipe_fds[0], F_GETFL)) == -1 ||
-          fcntl(pipe_fds[0], F_SETFL, flags | O_NONBLOCK) == -1;
+          fcntl(pipe_fds[0], F_SETFL, flags | O_NONBLOCK) == -1 ||
           (flags= fcntl(pipe_fds[1], F_GETFL)) == -1 ||
           fcntl(pipe_fds[1], F_SETFL, flags | O_NONBLOCK) == -1;
 }