From 31a8cf54c8a7913338480a0571feaf32143b5f64 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 19 Aug 2016 15:46:27 +0000 Subject: Revert "MDEV-9293 Connector/C integration" This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719. --- include/sql_common.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/sql_common.h') diff --git a/include/sql_common.h b/include/sql_common.h index b1fc89e9104..39b8ce18517 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -77,13 +77,9 @@ typedef struct st_mysql_methods #endif } MYSQL_METHODS; -#ifdef LIBMARIADB -#define simple_command(mysql, command, arg, length, skip_check) ma_simple_command(mysql, command, (char *)arg, length, skip_check, NULL) -#else #define simple_command(mysql, command, arg, length, skip_check) \ (*(mysql)->methods->advanced_command)(mysql, command, 0, \ 0, arg, length, skip_check, NULL) -#endif #define stmt_command(mysql, command, arg, length, stmt) \ (*(mysql)->methods->advanced_command)(mysql, command, 0, \ 0, arg, length, 1, stmt) @@ -114,7 +110,7 @@ void set_mysql_extended_error(MYSQL *mysql, int errcode, const char *sqlstate, /* client side of the pluggable authentication */ struct st_plugin_vio_info; - +void mpvio_info(Vio *vio, struct st_plugin_vio_info *info); int run_plugin_auth(MYSQL *mysql, char *data, uint data_len, const char *data_plugin, const char *db); int mysql_client_plugin_init(); -- cgit v1.2.1