From 1563988ae61ee32d6cad48252e7a37e3b9011026 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 2 Aug 2025 15:18:52 +0200 Subject: [PATCH] MDEV-37160 When >=2 clients are in use, the server_audit_file_buffer_size setting is not honored initialize cn->sync_statement everywhere where cn->thread_id is followup for ef3c843c172 and 7251cbca518 --- mysql-test/suite/plugins/r/server_audit_buffering.result | 1 - mysql-test/suite/plugins/t/server_audit_buffering.test | 3 --- plugin/server_audit/server_audit.c | 3 +++ 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/plugins/r/server_audit_buffering.result b/mysql-test/suite/plugins/r/server_audit_buffering.result index 9fd34db8d87..9d4c27a7262 100644 --- a/mysql-test/suite/plugins/r/server_audit_buffering.result +++ b/mysql-test/suite/plugins/r/server_audit_buffering.result @@ -20,7 +20,6 @@ server_audit_syslog_ident mysql-server_auditing server_audit_syslog_info server_audit_syslog_priority LOG_INFO set global server_audit_logging=on; -Line count in file: 1 set global server_audit_sync_log_file=on; Line count in file: 52 set global server_audit_file_buffer_size= 16384; diff --git a/mysql-test/suite/plugins/t/server_audit_buffering.test b/mysql-test/suite/plugins/t/server_audit_buffering.test index 70965347b55..b3a5138b61a 100644 --- a/mysql-test/suite/plugins/t/server_audit_buffering.test +++ b/mysql-test/suite/plugins/t/server_audit_buffering.test @@ -31,9 +31,6 @@ while ($counter) --enable_result_log --enable_query_log -let SEARCH_COUNT=1; ---source include/wait_for_line_count_in_file.inc - set global server_audit_sync_log_file=on; let SEARCH_COUNT=52; diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 274ea9e7b9a..1a70b1f8257 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -1166,6 +1166,7 @@ static void setup_connection_initdb(struct connection_info *cn, cn->thread_id= event->general_thread_id; cn->query_id= 0; + cn->sync_statement= 0; cn->query_length= 0; cn->log_always= 0; get_str_n(cn->db, &cn->db_length, sizeof(cn->db), @@ -1198,6 +1199,7 @@ static void setup_connection_table(struct connection_info *cn, { cn->thread_id= event->thread_id; cn->query_id= query_counter++; + cn->sync_statement= 0; cn->log_always= 0; cn->query_length= 0; get_str_n(cn->db, &cn->db_length, sizeof(cn->db), @@ -1219,6 +1221,7 @@ static void setup_connection_query(struct connection_info *cn, char uh_buffer[512]; cn->thread_id= event->general_thread_id; + cn->sync_statement= 0; cn->query_id= query_counter++; cn->log_always= 0; cn->query_length= 0;