5.3.4 merge

This commit is contained in:
Sergei Golubchik 2012-02-15 18:08:08 +01:00
commit 25609313ff
117 changed files with 4695 additions and 2204 deletions

View file

@ -89,7 +89,7 @@ mysql_declare_plugin(socket_auth)
{
MYSQL_AUTHENTICATION_PLUGIN,
&socket_auth_handler,
"auth_socket",
"unix_socket",
"Sergei Golubchik",
"Unix Socket based authentication",
PLUGIN_LICENSE_GPL,
@ -106,7 +106,7 @@ maria_declare_plugin(socket_auth)
{
MYSQL_AUTHENTICATION_PLUGIN,
&socket_auth_handler,
"auth_socket",
"unix_socket",
"Sergei Golubchik",
"Unix Socket based authentication",
PLUGIN_LICENSE_GPL,