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 branch '3.1' into 3.3

Browse Source
This commit is contained in:
Georg Richter
2023-10-21 19:46:00 +02:00
parent 26b2eddbf4 8320f0d54d
commit 4f5950b4b6
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/ma_context.c
View File

@@ -30,6 +30,9 @@
#endif #endif
#ifdef MY_CONTEXT_USE_UCONTEXT #ifdef MY_CONTEXT_USE_UCONTEXT
typedef void (*uc_func_t)(void);
/* /*
The makecontext() only allows to pass integers into the created context :-( The makecontext() only allows to pass integers into the created context :-(
We want to pass pointers, so we do it this kinda hackish way. We want to pass pointers, so we do it this kinda hackish way.
@@ -100,7 +103,7 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d)
c->user_data= d; c->user_data= d;
c->active= 1; c->active= 1;
u.p= c; u.p= c;
makecontext(&c->spawned_context, my_context_spawn_internal, 2, makecontext(&c->spawned_context, (uc_func_t)my_context_spawn_internal, 2,
u.a[0], u.a[1]); u.a[0], u.a[1]);
return my_context_continue(c); return my_context_continue(c);

2
libmariadb/ma_net.c
View File

@@ -292,7 +292,7 @@ static int ma_net_write_buff(NET *net,const char *packet, size_t len)
return 0; return 0;
} }
unsigned char *mysql_net_store_length(unsigned char *packet, size_t length); unsigned char *mysql_net_store_length(unsigned char *packet, ulonglong length);
/* Read and write using timeouts */ /* Read and write using timeouts */

2
plugins/auth/my_auth.c
View File

@@ -12,7 +12,7 @@ static int dummy_fallback_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql __attr
extern void read_user_name(char *name); extern void read_user_name(char *name);
extern char *ma_send_connect_attr(MYSQL *mysql, unsigned char *buffer); extern char *ma_send_connect_attr(MYSQL *mysql, unsigned char *buffer);
extern int ma_read_ok_packet(MYSQL *mysql, uchar *pos, ulong length); extern int ma_read_ok_packet(MYSQL *mysql, uchar *pos, ulong length);
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);
typedef struct { typedef struct {
int (*read_packet)(struct st_plugin_vio *vio, uchar **buf); int (*read_packet)(struct st_plugin_vio *vio, uchar **buf);