database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into cio

Browse Source 
Conflicts:
	CMakeLists.txt
	include/mysql/client_plugin.h
	libmariadb/client_plugin.c.in
	libmariadb/libmariadb.c
	libmariadb/ma_secure.c
	libmariadb/my_malloc.c
	libmariadb/net.c
	plugins/io/CMakeLists.txt
	unittest/libmariadb/misc.c
This commit is contained in:
Georg Richter
2015-10-02 12:28:54 +02:00
parent 05659c872e 9d12de0834
commit 74e62c2892
20 changed files with 499 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/client_plugin.h
View File

@@ -144,6 +144,7 @@ typedef char *(*mysql_authentication_dialog_ask_t)(struct st_mysql *mysql,
int type, const char *prompt, char *buf, int buf_len);
/********************** remote IO plugin **********************/
#ifdef HAVE_REMOTEIO
#include <mariadb/ma_io.h>
/* Remote IO plugin */
@@ -152,6 +153,7 @@ struct st_mysql_client_plugin_REMOTEIO
MYSQL_CLIENT_PLUGIN_HEADER
struct st_rio_methods *methods;
};
#endif
/******** using plugins ************/