Merge branch '10.0' into 10.1

This commit is contained in:
Sergei Golubchik 2015-12-21 21:24:22 +01:00
commit a2bcee626d
3462 changed files with 635147 additions and 221404 deletions

View file

@ -65,5 +65,5 @@ ENDIF()
ENDIF()
IF(ok)
MYSQL_ADD_PLUGIN(auth_socket auth_socket.c MODULE_ONLY)
MYSQL_ADD_PLUGIN(auth_socket auth_socket.c)
ENDIF()

View file

@ -105,7 +105,7 @@ static struct st_mysql_auth socket_auth_handler=
socket_auth
};
maria_declare_plugin(socket_auth)
maria_declare_plugin(auth_socket)
{
MYSQL_AUTHENTICATION_PLUGIN,
&socket_auth_handler,