From: Georgi Kodinov Date: April 5 2011 12:41pm Subject: bzr commit into mysql-trunk branch (Georgi.Kodinov:3328) List-Archive: http://lists.mysql.com/commits/134716 Message-Id: <201104051241.p35Cf8Qp008092@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///Users/kgeorge/mysql/work/mysql-trunk/ based on revid:alfranio.correia@stripped 3328 Georgi Kodinov 2011-04-05 [merge] merge mysql-5.5->mysql-trunk modified: plugin/auth/auth_socket.c === 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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).