diff options
| author | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-05-04 11:08:07 +0200 |
|---|---|---|
| committer | Mikael Ronstrom <mikael.ronstrom@oracle.com> | 2011-05-04 11:08:07 +0200 |
| commit | 385551271556a8a4f1c9b669a91cb08adf33a89f (patch) | |
| tree | 1d793c1b656afcb9c915a1ee3bf5ec796c2fcf78 /include | |
| parent | cb961461f28daf32d479f931f21c52509d4be3c0 (diff) | |
| parent | fabd4f9ae622526eedbd125c8b616bcc0b80c5be (diff) | |
| download | mariadb-git-385551271556a8a4f1c9b669a91cb08adf33a89f.tar.gz | |
merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 2 | ||||
| -rw-r--r-- | include/mysql/client_plugin.h | 5 | ||||
| -rw-r--r-- | include/mysql/client_plugin.h.pp | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index bb7f5ddfb3d..a35aea31a71 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -346,7 +346,7 @@ extern CHARSET_INFO my_charset_utf32_bin; extern CHARSET_INFO my_charset_utf32_general_ci; extern CHARSET_INFO my_charset_utf32_unicode_ci; -extern CHARSET_INFO my_charset_utf8_general_ci; +extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8_general_ci; extern CHARSET_INFO my_charset_utf8_unicode_ci; extern CHARSET_INFO my_charset_utf8_bin; extern CHARSET_INFO my_charset_utf8mb4_bin; diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h index cc3f468040f..6b37170aeab 100644 --- a/include/mysql/client_plugin.h +++ b/include/mysql/client_plugin.h @@ -156,8 +156,7 @@ mysql_client_register_plugin(struct st_mysql *mysql, @retval 0 on success, 1 in case of failure **/ -int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin, - const char *option, - const void *value); +int mysql_plugin_options(struct st_mysql_client_plugin *plugin, + const char *option, const void *value); #endif diff --git a/include/mysql/client_plugin.h.pp b/include/mysql/client_plugin.h.pp index e508f821aad..93eaff7501e 100644 --- a/include/mysql/client_plugin.h.pp +++ b/include/mysql/client_plugin.h.pp @@ -35,6 +35,5 @@ mysql_client_find_plugin(struct st_mysql *mysql, const char *name, int type); struct st_mysql_client_plugin * mysql_client_register_plugin(struct st_mysql *mysql, struct st_mysql_client_plugin *plugin); -int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin, - const char *option, - const void *value); +int mysql_plugin_options(struct st_mysql_client_plugin *plugin, + const char *option, const void *value); |