summaryrefslogtreecommitdiff
path: root/include/sql_common.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-08-19 20:03:05 +0000
committerSergei Golubchik <serg@mariadb.org>2016-08-25 16:27:57 +0200
commit56c4cfe0bea0fea8f80692c3df684b204cbfa731 (patch)
treedc433fb0f163f8d06498b1cc425c6a57298cf060 /include/sql_common.h
parent31a8cf54c8a7913338480a0571feaf32143b5f64 (diff)
downloadmariadb-git-56c4cfe0bea0fea8f80692c3df684b204cbfa731.tar.gz
MDEV-9293 - Use MariaDB's Connector/C in server
Diffstat (limited to 'include/sql_common.h')
-rw-r--r--include/sql_common.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/sql_common.h b/include/sql_common.h
index 39b8ce18517..6fdef6fef2b 100644
--- a/include/sql_common.h
+++ b/include/sql_common.h
@@ -77,9 +77,13 @@ 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)
@@ -110,7 +114,6 @@ 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();