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

Browse Source
This commit is contained in:
Georg Richter
2024-12-09 19:32:30 +01:00
parent d64461c742 136d295d02
commit 813a13e860
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb/mariadb_lib.c
View File

@@ -4078,7 +4078,7 @@ mysql_get_optionv(MYSQL *mysql, enum mysql_option option, void *arg, ...)
(uint)strlen((char *)key)))) (uint)strlen((char *)key))))
{ {
p+= strlen(key) + 1; p+= strlen(key) + 1;
*((void **)data)= *((void **)p); memcpy(data, p, sizeof(void *));
break; break;
} }
if (data) if (data)

10
plugins/auth/my_auth.c
View File

@@ -7,7 +7,7 @@
#include <mysql/client_plugin.h> #include <mysql/client_plugin.h>
typedef struct st_mysql_client_plugin_AUTHENTICATION auth_plugin_t; typedef struct st_mysql_client_plugin_AUTHENTICATION auth_plugin_t;
static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, size_t); static int client_mpvio_write_packet(struct st_plugin_vio*, const uchar*, int);
static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql); static int native_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
static int native_password_hash(MYSQL *mysql, unsigned char *out, size_t *outlen); static int native_password_hash(MYSQL *mysql, unsigned char *out, size_t *outlen);
static int dummy_fallback_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql __attribute__((unused))); static int dummy_fallback_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql __attribute__((unused)));
@@ -22,7 +22,7 @@ extern const char *disabled_plugins;
typedef struct { typedef struct {
int (*read_packet)(struct st_plugin_vio *vio, uchar **buf); int (*read_packet)(struct st_plugin_vio *vio, uchar **buf);
int (*write_packet)(struct st_plugin_vio *vio, const uchar *pkt, size_t pkt_len); int (*write_packet)(struct st_plugin_vio *vio, const uchar *pkt, int pkt_len);
void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info); void (*info)(struct st_plugin_vio *vio, struct st_plugin_vio_info *info);
/* -= end of MYSQL_PLUGIN_VIO =- */ /* -= end of MYSQL_PLUGIN_VIO =- */
MYSQL *mysql; MYSQL *mysql;
@@ -600,7 +600,7 @@ static int client_mpvio_read_packet(struct st_plugin_vio *mpv, uchar **buf)
*/ */
static int client_mpvio_write_packet(struct st_plugin_vio *mpv, static int client_mpvio_write_packet(struct st_plugin_vio *mpv,
const uchar *pkt, size_t pkt_len) const uchar *pkt, int pkt_len)
{ {
int res; int res;
MCPVIO_EXT *mpvio= (MCPVIO_EXT*)mpv; MCPVIO_EXT *mpvio= (MCPVIO_EXT*)mpv;
@@ -608,9 +608,9 @@ static int client_mpvio_write_packet(struct st_plugin_vio *mpv,
if (mpvio->packets_written == 0) if (mpvio->packets_written == 0)
{ {
if (mpvio->mysql_change_user) if (mpvio->mysql_change_user)
res= send_change_user_packet(mpvio, pkt, (int)pkt_len); res= send_change_user_packet(mpvio, pkt, pkt_len);
else else
res= send_client_reply_packet(mpvio, pkt, (int)pkt_len); res= send_client_reply_packet(mpvio, pkt, pkt_len);
} }
else else
{ {