database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Merge remote-tracking branch 'origin/3.1' into 3.3

Browse Source 
# Conflicts:
#	include/ma_crypt.h
#	libmariadb/mariadb_lib.c
This commit is contained in:
Vladislav Vaintroub
2023-09-21 23:45:35 +02:00
parent 9a0ddd87d3 1b3cf6b441
commit 463a50e973
13 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb/mariadb_lib.c
View File

@@ -123,7 +123,7 @@ extern int mthd_stmt_fetch_to_bind(MYSQL_STMT *stmt, unsigned char *row);
extern int mthd_stmt_read_all_rows(MYSQL_STMT *stmt);
extern void mthd_stmt_flush_unbuffered(MYSQL_STMT *stmt);
extern my_bool _mariadb_read_options(MYSQL *mysql, const char *dir, const char *config_file, const char *group, unsigned int recursion);
extern unsigned char *mysql_net_store_length(unsigned char *packet, size_t length);
extern unsigned char *mysql_net_store_length(unsigned char *packet, ulonglong length);
extern void
my_context_install_suspend_resume_hook(struct mysql_async_context *b,