bk commit into 5.0 tree (petr:1.1948)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.0 repository of cps. When cps 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
  1.1948 05/08/05 17:48:37 petr@stripped +1 -0
  post-review fix

  server-tools/instance-manager/listener.cc
    1.17 05/08/05 17:48:31 petr@stripped +5 -4
    some more cleanup

# 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:	petr
# Host:	owlet.
# Root:	/home/cps/mysql/trees/mysql-5.0

--- 1.16/server-tools/instance-manager/listener.cc	2005-08-05 17:02:00 +04:00
+++ 1.17/server-tools/instance-manager/listener.cc	2005-08-05 17:48:31 +04:00
@@ -150,8 +150,9 @@
         /* accept may return -1 (failure or spurious wakeup) */
         if (client_fd >= 0)                    // connection established
         {
-          Vio *vio= vio_new(client_fd, socket_index==0?VIO_TYPE_SOCKET:
-                            VIO_TYPE_TCPIP, socket_index==0?1:0);
+          Vio *vio= vio_new(client_fd, socket_index == 0 ?
+                            VIO_TYPE_SOCKET : VIO_TYPE_TCPIP,
+                            socket_index == 0 ? 1 : 0);
           if (vio != 0)
             handle_new_mysql_connection(vio);
           else
@@ -273,8 +274,8 @@
 }
 
 #ifndef __WIN__
-int Listener_thread::create_unix_socket(struct sockaddr_un
-                                        &unix_socket_address)
+int Listener_thread::
+create_unix_socket(struct sockaddr_un &unix_socket_address)
 {
   int unix_socket= socket(AF_UNIX, SOCK_STREAM, 0);
   if (unix_socket == INVALID_SOCKET)