bzr commit into mysql-trunk branch (Georgi.Kodinov:3634)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B59884-trunk/ based on revid:georgi.kodinov@stripped

 3634 Georgi Kodinov	2011-02-10 [merge]
      merge 59017 to mysql-trunk

    modified:
      plugin/auth/auth_socket.c
=== modified file 'plugin/auth/auth_socket.c'
--- a/plugin/auth/auth_socket.c	2010-09-20 16:38:27 +0000
+++ b/plugin/auth/auth_socket.c	2011-01-11 14:53:14 +0000
@@ -79,7 +79,7 @@ mysql_declare_plugin(socket_auth)
 {
   MYSQL_AUTHENTICATION_PLUGIN,
   &socket_auth_handler,
-  "socket_peercred",
+  "auth_socket",
   "Sergei Golubchik",
   "Unix Socket based authentication",
   PLUGIN_LICENSE_GPL,

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).