From 291fd9698340f3d83ff096542720f7335cb078d2 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 29 Mar 2010 17:13:53 +0200 Subject: pluggable auth with plugin examples Makefile.am: add new API files to the check_abi rule, remove duplicates client/CMakeLists.txt: now a client can use dlopen too client/Makefile.am: be csh-friendly include/my_global.h: add dummy plugs for dlopen and co. for the code that needs them to work in static builds mysys/Makefile.am: be csh-friendly plugin/auth/dialog.c: typo fixed --- sql/client_settings.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sql/client_settings.h') diff --git a/sql/client_settings.h b/sql/client_settings.h index 4f06c15a29e..ed1e8d67cfe 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -15,6 +15,7 @@ #include +#include #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ CLIENT_SECURE_CONNECTION | CLIENT_TRANSACTIONS | \ @@ -31,7 +32,8 @@ #undef HAVE_SMEM #undef _CUSTOMCONFIG_ -#define mysql_server_init(a,b,c) 0 +#define mysql_server_init(a,b,c) mysql_client_plugin_init() +#define mysql_server_end() mysql_client_plugin_deinit() #ifdef HAVE_REPLICATION C_MODE_START -- cgit v1.2.1 From 3b03f5d97e0f80da74cb0789f513ce0319fc9c8a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 2 Apr 2010 11:20:09 +0200 Subject: fixes for windows builds --- sql/client_settings.h | 1 - 1 file changed, 1 deletion(-) (limited to 'sql/client_settings.h') diff --git a/sql/client_settings.h b/sql/client_settings.h index ed1e8d67cfe..850903a24e5 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -29,7 +29,6 @@ #define mysql_master_send_query(A, B, C) 1 #define mysql_slave_send_query(A, B, C) 1 #define mysql_rpl_probe(mysql) 0 -#undef HAVE_SMEM #undef _CUSTOMCONFIG_ #define mysql_server_init(a,b,c) mysql_client_plugin_init() -- cgit v1.2.1