diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /sql/client_settings.h | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'sql/client_settings.h')
| -rw-r--r-- | sql/client_settings.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/client_settings.h b/sql/client_settings.h index 7d103d5904d..3152bc47845 100644 --- a/sql/client_settings.h +++ b/sql/client_settings.h @@ -21,6 +21,7 @@ #endif /* CLIENT_SETTINGS_INCLUDED */ #include <thr_alarm.h> +#include <sql_common.h> #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | \ CLIENT_SECURE_CONNECTION | CLIENT_TRANSACTIONS | \ @@ -30,10 +31,10 @@ #define set_sigpipe(mysql) #define reset_sigpipe(mysql) #define read_user_name(A) {} -#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 |