diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-12-02 16:26:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-12-02 16:26:43 +0100 |
| commit | d5fd757a4279f4fa8f032c6dd63d1d121d8e1fea (patch) | |
| tree | ad5b63e8b1d154ab7b1753f9e156e7741b01899d /include/mysql | |
| parent | 791286ee1c3c705cb8853e242cdf718a7b5ce5b7 (diff) | |
| download | mariadb-git-d5fd757a4279f4fa8f032c6dd63d1d121d8e1fea.tar.gz | |
1. add --plugin-dir and --default-auth to mysqltest.
2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type
3. split get_tty_password into get_tty_password_buff and strdup.
4. dialog plugin now uses get_tty_password by default
5. dialog.test
6. moved small tests of individual plugins into a dedicated suite
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/client_plugin.h | 8 | ||||
| -rw-r--r-- | include/mysql/plugin.h | 32 |
2 files changed, 22 insertions, 18 deletions
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index 33c63b9df33..f463277c530 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -28,9 +28,7 @@ #include <stdlib.h> #endif -#ifdef MYSQL_PLUGIN_EXPORT #undef MYSQL_PLUGIN_EXPORT -#endif #if defined(_MSC_VER) #ifdef __cplusplus #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) @@ -38,7 +36,11 @@ #define MYSQL_PLUGIN_EXPORT __declspec(dllexport) #endif #else /*_MSC_VER */ -#define MYSQL_PLUGIN_EXPORT + #ifdef __cplusplus + #define MYSQL_PLUGIN_EXPORT extern "C" + #else + #define MYSQL_PLUGIN_EXPORT + #endif #endif /* known plugin types */ diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index bacc4bd7bd8..b8f4ad6f3fc 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -25,21 +25,17 @@ for functions. */ #if defined(_MSC_VER) -#if defined(MYSQL_DYNAMIC_PLUGIN) #ifdef __cplusplus #define MYSQL_PLUGIN_EXPORT extern "C" __declspec(dllexport) #else #define MYSQL_PLUGIN_EXPORT __declspec(dllexport) #endif -#else /* MYSQL_DYNAMIC_PLUGIN */ +#else /*_MSC_VER */ #ifdef __cplusplus - #define MYSQL_PLUGIN_EXPORT extern "C" + #define MYSQL_PLUGIN_EXPORT extern "C" #else - #define MYSQL_PLUGIN_EXPORT + #define MYSQL_PLUGIN_EXPORT #endif -#endif /*MYSQL_DYNAMIC_PLUGIN */ -#else /*_MSC_VER */ -#define MYSQL_PLUGIN_EXPORT #endif #ifdef __cplusplus @@ -129,14 +125,20 @@ struct st_maria_plugin DECLS[]= { #else #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ -MYSQL_PLUGIN_EXPORT int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ -MYSQL_PLUGIN_EXPORT int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ -MYSQL_PLUGIN_EXPORT struct st_mysql_plugin _mysql_plugin_declarations_[]= { - -#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ -MYSQL_PLUGIN_EXPORT int _maria_plugin_interface_version_= MARIA_PLUGIN_INTERFACE_VERSION; \ -MYSQL_PLUGIN_EXPORT int _maria_sizeof_struct_st_plugin_= sizeof(struct st_maria_plugin); \ -MYSQL_PLUGIN_EXPORT struct st_maria_plugin _maria_plugin_declarations_[]= { +MYSQL_PLUGIN_EXPORT int _mysql_plugin_interface_version_; \ +int _mysql_plugin_interface_version_= MYSQL_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int _mysql_sizeof_struct_st_plugin_; \ +int _mysql_sizeof_struct_st_plugin_= sizeof(struct st_mysql_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_mysql_plugin _mysql_plugin_declarations_[]; \ +struct st_mysql_plugin _mysql_plugin_declarations_[]= { + +#define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ +MYSQL_PLUGIN_EXPORT int _maria_plugin_interface_version_; \ +int _maria_plugin_interface_version_= MARIA_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int _maria_sizeof_struct_st_plugin_; \ +int _maria_sizeof_struct_st_plugin_= sizeof(struct st_maria_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_maria_plugin _maria_plugin_declarations_[]; \ +struct st_maria_plugin _maria_plugin_declarations_[]= { #endif |