database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-13137 MySQL 5.6.23 Crashes when SET GLOBAL server_audit_logging=OFF;

Browse Source 
The MySQL 5.6 doesn't always send the MYSQL_AUDIT_GENERAL_LOG
        notification. So we have to suppress the log_current_query()
        in this case.
This commit is contained in:
Alexey Botchkov
2017-09-19 13:08:24 +04:00
parent a870099817
commit 389f7cdf3c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/server_audit/server_audit.c
View File

@@ -15,7 +15,7 @@
#define PLUGIN_VERSION 0x104 #define PLUGIN_VERSION 0x104
#define PLUGIN_STR_VERSION "1.4.1" #define PLUGIN_STR_VERSION "1.4.2"
#define _my_thread_var loc_thread_var #define _my_thread_var loc_thread_var
@@ -1089,6 +1089,7 @@ static void setup_connection_connect(struct connection_info *cn,
const struct mysql_event_connection *event) const struct mysql_event_connection *event)
{ {
cn->query_id= 0; cn->query_id= 0;
cn->query_length= 0;
cn->log_always= 0; cn->log_always= 0;
cn->thread_id= event->thread_id; cn->thread_id= event->thread_id;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db), get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
@@ -1130,6 +1131,7 @@ static void setup_connection_initdb(struct connection_info *cn,
cn->thread_id= event->general_thread_id; cn->thread_id= event->general_thread_id;
cn->query_id= 0; cn->query_id= 0;
cn->query_length= 0;
cn->log_always= 0; cn->log_always= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db), get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
event->general_query, event->general_query_length); event->general_query, event->general_query_length);
@@ -1162,6 +1164,7 @@ static void setup_connection_table(struct connection_info *cn,
cn->thread_id= event->thread_id; cn->thread_id= event->thread_id;
cn->query_id= query_counter++; cn->query_id= query_counter++;
cn->log_always= 0; cn->log_always= 0;
cn->query_length= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db), get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
event->database, event->database_length); event->database, event->database_length);
get_str_n(cn->user, &cn->user_length, sizeof(cn->db), get_str_n(cn->user, &cn->user_length, sizeof(cn->db),
@@ -1183,6 +1186,7 @@ static void setup_connection_query(struct connection_info *cn,
cn->thread_id= event->general_thread_id; cn->thread_id= event->general_thread_id;
cn->query_id= query_counter++; cn->query_id= query_counter++;
cn->log_always= 0; cn->log_always= 0;
cn->query_length= 0;
get_str_n(cn->db, &cn->db_length, sizeof(cn->db), "", 0); get_str_n(cn->db, &cn->db_length, sizeof(cn->db), "", 0);
if (get_user_host(event->general_user, event->general_user_length, if (get_user_host(event->general_user, event->general_user_length,
@@ -2007,6 +2011,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
event_query_command(event)) event_query_command(event))
{ {
log_statement(cn, event, "QUERY"); log_statement(cn, event, "QUERY");
cn->query_length= 0; /* So the log_current_query() won't log this again. */
} }
} }
else if (event_class == MYSQL_AUDIT_TABLE_CLASS && FILTER(EVENT_TABLE) && cn) else if (event_class == MYSQL_AUDIT_TABLE_CLASS && FILTER(EVENT_TABLE) && cn)
@@ -2522,7 +2527,8 @@ static void log_current_query(MYSQL_THD thd)
if (!thd) if (!thd)
return; return;
cn= get_loc_info(thd); cn= get_loc_info(thd);
if (!ci_needs_setup(cn) && FILTER(EVENT_QUERY) && do_log_user(cn->user)) if (!ci_needs_setup(cn) && cn->query_length &&
FILTER(EVENT_QUERY) && do_log_user(cn->user))
{ {
log_statement_ex(cn, cn->query_time, thd_get_thread_id(thd), log_statement_ex(cn, cn->query_time, thd_get_thread_id(thd),
cn->query, cn->query_length, 0, "QUERY"); cn->query, cn->query_length, 0, "QUERY");