From: Georgi Kodinov
Date: April 5 2011 12:41pm
Subject: bzr push into mysql-trunk branch (Georgi.Kodinov:3327 to 3328)
List-Archive: http://lists.mysql.com/commits/134717
Message-Id: <201104051241.p35CfbGM007261@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3328 Georgi Kodinov	2011-04-05 [merge]
      merge mysql-5.5->mysql-trunk

    modified:
      plugin/auth/auth_socket.c
 3327 Alfranio Correia	2011-04-04
      BUG#11766392 - BUG#59495 Post-fix:
      
        . Suppressing warning message that was making tests to fail.
      
        . Disregarding the error code to print the warning message
          as windows and unix fails with different errors for the
          same problem (e.g. file does not exist).
      
        . Using F_OK to return success or error to upper functions,
          thus keeping the original behavior in order to avoid
          issues with differences between windows and unix.

    modified:
      mysql-test/include/mtr_warnings.sql
      sql/rpl_info_file.cc
=== modified file 'plugin/auth/auth_socket.c'
--- a/plugin/auth/auth_socket.c	2011-01-11 14:53:14 +0000
+++ b/plugin/auth/auth_socket.c	2011-04-05 12:25:19 +0000
@@ -17,7 +17,7 @@
 /**
   @file
 
-  socket_peercred authentication plugin.
+  auth_socket authentication plugin.
 
   Authentication is successful if the connection is done via a unix socket and
   the owner of the client process matches the user name that was used when

No bundle (reason: useless for push emails).