diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-26 15:22:31 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-26 15:22:31 +0300 |
| commit | 4c7a74396497ae28779016b5bd59283aeee0b6f4 (patch) | |
| tree | 31c49a23aede628f3afc3999faa290bc522923ad /plugin | |
| parent | de9e3930940c44458d254987066a81f1cea9b500 (diff) | |
| parent | 29df1003d9faf09b635eedf10a0e3196e71bb297 (diff) | |
| download | mariadb-git-4c7a74396497ae28779016b5bd59283aeee0b6f4.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/server_audit/server_audit.c | 6 | ||||
| -rw-r--r-- | plugin/server_audit/test_audit_v4.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 0832e7f390d..b371cb0e706 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -16,7 +16,7 @@ #define PLUGIN_VERSION 0x104 -#define PLUGIN_STR_VERSION "1.4.7" +#define PLUGIN_STR_VERSION "1.4.8" #define _my_thread_var loc_thread_var @@ -2261,7 +2261,7 @@ static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0) } -int get_db_mysql57(MYSQL_THD thd, char **name, int *len) +int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len) { int db_off; int db_len_off; @@ -2288,7 +2288,7 @@ int get_db_mysql57(MYSQL_THD thd, char **name, int *len) #ifdef __linux__ *name= *(char **) (((char *) thd) + db_off); - *len= *((int *) (((char*) thd) + db_len_off)); + *len= *((size_t *) (((char*) thd) + db_len_off)); if (*name && (*name)[*len] != 0) return 1; return 0; diff --git a/plugin/server_audit/test_audit_v4.c b/plugin/server_audit/test_audit_v4.c index 8cb24bc693b..f37d8c7c34a 100644 --- a/plugin/server_audit/test_audit_v4.c +++ b/plugin/server_audit/test_audit_v4.c @@ -16,7 +16,7 @@ enum enum_server_command{ SERVCOM_A, SERVCOM_B }; #include "plugin_audit_v4.h" extern void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev); -extern int get_db_mysql57(MYSQL_THD thd, char **name, int *len); +extern int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len); struct mysql_event_general_302 @@ -35,7 +35,7 @@ struct mysql_event_general_302 unsigned long long general_rows; unsigned long long query_id; char *database; - int database_length; + size_t database_length; }; |