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

More fixes and renames for 10.2 integration

Browse Source
This commit is contained in:
Georg Richter
2016-02-03 09:14:01 +01:00
parent 3c8889d6cc
commit 9e4bd29447
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mysql.h
View File

@@ -134,7 +134,7 @@ extern unsigned int mariadb_deinitialize_ssl;
}
/* For mysql_async.c */
#define set_mysql_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0)
#define set_mariadb_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0)
#define unknown_sqlstate SQLSTATE_UNKNOWN
#define CLEAR_CLIENT_ERROR(a) \
@@ -337,7 +337,7 @@ struct st_mysql_options {
my_bool unused_2;
void *unused_3, *unused_4, *unused_5, *unused_6;
LIST *stmts;
const struct st_mysql_methods *methods;
const struct st_mariadb_methods *methods;
void *thd;
my_bool *unbuffered_fetch_owner;
char *info_buffer;
@@ -762,7 +762,7 @@ struct st_mariadb_api {
};
/* these methods can be overwritten by db plugins */
struct st_mysql_methods {
struct st_mariadb_methods {
MYSQL *(*db_connect)(MYSQL *mysql, const char *host, const char *user, const char *passwd,
const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag);
void (*db_close)(MYSQL *mysql);