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/cio'

Browse Source
This commit is contained in:
Georg Richter
2015-10-18 13:53:09 +02:00
parent 8daf65adbf 3a6e2fd16d
commit 1b597e0e37
53 changed files with 6706 additions and 2652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/mysql.h
View File

@@ -212,7 +212,8 @@ extern unsigned int mariadb_deinitialize_ssl;
/* MariaDB Connector/C specific */
MYSQL_DATABASE_DRIVER=7000,
MARIADB_OPT_SSL_FP, /* single finger print for server certificate verification */
MARIADB_OPT_SSL_FP_LIST /* finger print white list for server certificate verification */
MARIADB_OPT_SSL_FP_LIST, /* finger print white list for server certificate verification */
MARIADB_OPT_CONNECTION_READ_ONLY
};
enum mysql_status { MYSQL_STATUS_READY,
@@ -231,8 +232,6 @@ extern unsigned int mariadb_deinitialize_ssl;
MYSQL_PROTOCOL_PIPE, MYSQL_PROTOCOL_MEMORY
};
struct st_mysql_options_extension;
struct st_mysql_options {
unsigned int connect_timeout, read_timeout, write_timeout;
unsigned int port, protocol;
@@ -251,7 +250,7 @@ struct st_mysql_options {
my_bool compress,named_pipe;
my_bool unused_1, unused_2, unused_3, unused_4;
enum mysql_option methods_to_use;
char *client_ip;
char *bind_address;
my_bool secure_auth;
my_bool report_data_truncation;
/* function pointers for local infile support */
@@ -627,6 +626,7 @@ struct st_mysql_methods {
int (*db_stmt_fetch)(MYSQL_STMT *stmt, unsigned char **row);
int (*db_stmt_fetch_to_bind)(MYSQL_STMT *stmt, unsigned char *row);
void (*db_stmt_flush_unbuffered)(MYSQL_STMT *stmt);
void (*set_error)(MYSQL *mysql, unsigned int error_nr, const char *sqlstate, const char *format, ...);
};
/* synonyms/aliases functions */