summaryrefslogtreecommitdiff
path: root/include/sql_common.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-08-19 15:46:27 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2016-08-19 15:46:27 +0000
commit31a8cf54c8a7913338480a0571feaf32143b5f64 (patch)
tree8847835f515af17d6c090300b138c31e1226731e /include/sql_common.h
parent7b89b9f5108c80f4f270da922d7e6c182a663719 (diff)
downloadmariadb-git-31a8cf54c8a7913338480a0571feaf32143b5f64.tar.gz
Revert "MDEV-9293 Connector/C integration"
This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
Diffstat (limited to 'include/sql_common.h')
-rw-r--r--include/sql_common.h6
1 files changed, 1 insertions, 5 deletions
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();