From fa47c73561efbb07500355c0e5161e7556e15c49 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 19 Mar 2025 22:20:35 +0100 Subject: [PATCH] MDEV-12182 post-merge * fix plugin version * don't print :unavaliable for localhost --- include/mysql/plugin_audit.h | 1 + .../suite/plugins/r/server_audit.result | 510 +++++++++--------- .../plugins/r/thread_pool_server_audit.result | 302 +++++------ mysql-test/suite/plugins/t/server_audit.test | 6 +- .../plugins/t/thread_pool_server_audit.test | 5 +- plugin/server_audit/server_audit.c | 15 +- 6 files changed, 418 insertions(+), 421 deletions(-) diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h index a2aba9f7ead..be83c7e02f7 100644 --- a/include/mysql/plugin_audit.h +++ b/include/mysql/plugin_audit.h @@ -66,6 +66,7 @@ struct mysql_event_general unsigned long long general_rows; /* Added in version 0x302 */ unsigned long long query_id; + /* Added in version 0x303 */ unsigned int port; MYSQL_CONST_LEX_STRING database; }; diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result index cd2619576b6..7e13b2fd13f 100644 --- a/mysql-test/suite/plugins/r/server_audit.result +++ b/mysql-test/suite/plugins/r/server_audit.result @@ -227,8 +227,7 @@ set global server_audit_events='table'; set global server_audit_incl_users='user1'; create user user1@localhost; grant all on sa_db.* to user1@localhost; -connect cn1,localhost,user1,,sa_db; -connection cn1; +connect cn1,127.0.0.1,user1,,sa_db,$MASTER_MYPORT; create table t1(id int) engine=myisam; insert delayed into t1 values (1); connection default; @@ -248,7 +247,6 @@ connect plug_con,localhost,plug,plug_dest; ERROR 28000: Access denied for user 'plug'@'localhost' (using password: YES) GRANT PROXY ON plug_dest TO plug; connect plug_con,localhost,plug,plug_dest,"*NO-ONE*"; -connection plug_con; select USER(),CURRENT_USER(); USER() CURRENT_USER() plug@localhost plug_dest@% @@ -322,259 +320,259 @@ server_audit_syslog_priority LOG_INFO uninstall plugin server_audit; Warnings: Warning 1620 Plugin is busy and will be uninstalled on shutdown -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_logging=on',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_incl_users= repeat("\'root\',", 10000)',ID -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'show variables like \'server_audit_incl_users\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_excl_users= repeat("\'root\',", 10000)',ID -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'show variables like \'server_audit_excl_users\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,0,CONNECT,mysql,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,0,DISCONNECT,mysql,,0 -TIME,HOSTNAME,no_such_user,localhost:unavailable,ID,0,FAILED_CONNECT,,,ID -TIME,HOSTNAME,no_such_user,localhost:unavailable,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,CREATE,test,t2, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'create table t2 (id int)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_excl_users=\'odin, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'SHOW WARNINGS',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select * from t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,test,t2, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,test,t2, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select * from t2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,ALTER,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,RENAME,test,t1|test.renamed_t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select * from t2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'syntax_error_query',ID -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'drop table renamed_t1, t2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'show variables like \'server_audit%\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_mode=1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'set global server_audit_events=\'\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'create database sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,0,CONNECT,test,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,CREATE,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'create table t1 (id2 int)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'select * from t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,DROP,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'drop table t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'use sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,CREATE,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'create table sa_t1(id int)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'insert into sa_t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,DROP,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop table sa_t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,proc, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proc, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,event, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop database sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,test,'create database sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'use sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'ALTER USER u3 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'create table t1(id int)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop table t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'create procedure pr1() insert into test.t1 values ("foo", 42)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'create function fn1(i int) returns int deterministic return i+1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop procedure pr1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop function fn1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'create table t1(id int)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select * from t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select 2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop table t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select * from t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select 2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'(select 2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'/*! select 2*/',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'SET PASSWORD \n# comment\nFOR u1 = PASSWORD(*****)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=',ID -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,user1,localhost:unavailable,ID,ID,CREATE,sa_db,t1, -TIME,HOSTNAME,user1,localhost:unavailable,ID,ID,WRITE,sa_db,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_logging= off',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_incl_users=\'root, plug_dest, ssl_user1\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER plug IDENTIFIED WITH \'test_plugin_server\' AS \'plug_dest\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER plug_dest IDENTIFIED BY *****',0 -TIME,HOSTNAME,plug,localhost:unavailable,ID,0,FAILED_CONNECT,,,ID -TIME,HOSTNAME,plug,localhost:unavailable,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'GRANT PROXY ON plug_dest TO plug',0 -TIME,HOSTNAME,plug,localhost:unavailable,ID,0,CONNECT,,,0 -TIME,HOSTNAME,plug,localhost:unavailable,ID,0,PROXY_CONNECT,,`plug_dest`@`%`,0 -TIME,HOSTNAME,plug,localhost:unavailable,ID,ID,QUERY,,'select USER(),CURRENT_USER()',0 -TIME,HOSTNAME,plug,localhost:unavailable,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'DROP USER plug',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'DROP USER plug_dest',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE USER ssl_user1@localhost require SSL',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO ssl_user1@localhost',0 -TIME,HOSTNAME,ssl_user1,localhost:unavailable,ID,0,CONNECT,sa_db,TLS_VERSION,0 -TIME,HOSTNAME,ssl_user1,localhost:unavailable,ID,ID,QUERY,sa_db,'SHOW STATUS LIKE \'Ssl_version\'',0 -TIME,HOSTNAME,ssl_user1,localhost:unavailable,ID,ID,QUERY,sa_db,'select variable_value > \'\' as \'have_ssl\' from information_schema.session_status where variable_name=\'ssl_cipher\'',0 -TIME,HOSTNAME,ssl_user1,localhost:unavailable,ID,0,DISCONNECT,sa_db,TLS_VERSION,0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'DROP USER ssl_user1@localhost',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global serv',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select (1), (2)',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select \'A\', ',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_query_log_limit= 1024',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,proc, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,proc, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,event, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop database sa_db',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'select length(\'012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,CREATE,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'CREATE TABLE test.t1 (a char(4))',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set sql_mode=""',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'insert into test.t1 value("12345")',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set sql_mode=default',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,DROP,test,t1, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'drop table test.t1',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'show variables like \'server_audit%\'',0 -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,WRITE,mysql,plugin, -TIME,HOSTNAME,root,localhost:unavailable,ID,ID,QUERY,sa_db,'uninstall plugin server_audit',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=on',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users= repeat("\'root\',", 10000)',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit_incl_users\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_excl_users= repeat("\'root\',", 10000)',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit_excl_users\'',0 +TIME,HOSTNAME,root,localhost,ID,0,CONNECT,mysql,,0 +TIME,HOSTNAME,root,localhost,ID,0,DISCONNECT,mysql,,0 +TIME,HOSTNAME,no_such_user,localhost,ID,0,FAILED_CONNECT,,,ID +TIME,HOSTNAME,no_such_user,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create table t2 (id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_excl_users=\'odin, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'SHOW WARNINGS',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,ALTER,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'syntax_error_query',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'drop table renamed_t1, t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit%\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_mode=1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,0,CONNECT,test,,0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create table t1 (id2 int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,DROP,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'use sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table sa_t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into sa_t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,DROP,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table sa_t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,event, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'use sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'ALTER USER u3 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create procedure pr1() insert into test.t1 values ("foo", 42)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create function fn1(i int) returns int deterministic return i+1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop procedure pr1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop function fn1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'(select 2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD \n# comment\nFOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,user1,localhost:PORT,ID,ID,CREATE,sa_db,t1, +TIME,HOSTNAME,user1,localhost,ID,ID,WRITE,sa_db,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_logging= off',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_incl_users=\'root, plug_dest, ssl_user1\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER plug IDENTIFIED WITH \'test_plugin_server\' AS \'plug_dest\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER plug_dest IDENTIFIED BY *****',0 +TIME,HOSTNAME,plug,localhost,ID,0,FAILED_CONNECT,,,ID +TIME,HOSTNAME,plug,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT PROXY ON plug_dest TO plug',0 +TIME,HOSTNAME,plug,localhost,ID,0,CONNECT,,,0 +TIME,HOSTNAME,plug,localhost,ID,0,PROXY_CONNECT,,`plug_dest`@`%`,0 +TIME,HOSTNAME,plug,localhost,ID,ID,QUERY,,'select USER(),CURRENT_USER()',0 +TIME,HOSTNAME,plug,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'DROP USER plug',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'DROP USER plug_dest',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER ssl_user1@localhost require SSL',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO ssl_user1@localhost',0 +TIME,HOSTNAME,ssl_user1,localhost,ID,0,CONNECT,sa_db,TLS_VERSION,0 +TIME,HOSTNAME,ssl_user1,localhost,ID,ID,QUERY,sa_db,'SHOW STATUS LIKE \'Ssl_version\'',0 +TIME,HOSTNAME,ssl_user1,localhost,ID,ID,QUERY,sa_db,'select variable_value > \'\' as \'have_ssl\' from information_schema.session_status where variable_name=\'ssl_cipher\'',0 +TIME,HOSTNAME,ssl_user1,localhost,ID,0,DISCONNECT,sa_db,TLS_VERSION,0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'DROP USER ssl_user1@localhost',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global serv',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select \'A\', ',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_query_log_limit= 1024',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,event, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select length(\'012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567',0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE TABLE test.t1 (a char(4))',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set sql_mode=""',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into test.t1 value("12345")',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set sql_mode=default',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,DROP,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table test.t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show variables like \'server_audit%\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,plugin, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'uninstall plugin server_audit',0 # # MDEV-27631 Assertion `global_status_var.global_memory_used == 0' failed in mysqld_exit # diff --git a/mysql-test/suite/plugins/r/thread_pool_server_audit.result b/mysql-test/suite/plugins/r/thread_pool_server_audit.result index 98ac3484584..8c6ece53227 100644 --- a/mysql-test/suite/plugins/r/thread_pool_server_audit.result +++ b/mysql-test/suite/plugins/r/thread_pool_server_audit.result @@ -239,154 +239,154 @@ server_audit_syslog_priority LOG_INFO uninstall plugin server_audit; Warnings: Warning 1620 Plugin is busy and will be uninstalled on shutdown -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_logging=on',0 -TIME,HOSTNAME,root,localhost:port,ID,0,CONNECT,mysql,,0 -TIME,HOSTNAME,root,localhost:port,ID,0,DISCONNECT,mysql,,0 -TIME,HOSTNAME,no_such_user,localhost:port,ID,0,FAILED_CONNECT,,,ID -TIME,HOSTNAME,no_such_user,localhost:port,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,CREATE,test,t2, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'create table t2 (id int)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_excl_users=\'odin, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'SHOW WARNINGS',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select * from t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,test,t2, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,test,t2, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select * from t2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,ALTER,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,RENAME,test,t1|test.renamed_t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select * from t2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'syntax_error_query',ID -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'drop table renamed_t1, t2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'show variables like \'server_audit%\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_mode=1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'set global server_audit_events=\'\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'create database sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,0,CONNECT,test,,0 -TIME,HOSTNAME,root,localhost:port,ID,ID,CREATE,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'create table t1 (id2 int)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'select * from t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,DROP,test,t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'drop table t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'use sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,CREATE,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'create table sa_t1(id int)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'insert into sa_t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,table_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,column_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,index_stats, -TIME,HOSTNAME,root,localhost:port,ID,ID,DROP,sa_db,sa_t1, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop table sa_t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,proc, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,proc, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,event, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop database sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,0,DISCONNECT,,,0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,test,'create database sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'use sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,db, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,tables_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,columns_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,procs_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,proxies_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,roles_mapping, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,global_priv, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'create table t1(id int)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop table t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'create table t1(id int)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select * from t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select 2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop table t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select * from t1',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select 2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'(select 2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'/*! select 2*/',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'SET PASSWORD\n# comment\nFOR u1 = PASSWORD(*****)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=',ID -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global serv',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select (1), (2)',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'select \'A\', ',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_query_log_limit= 1024',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,READ,mysql,proc, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,proc, -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,event, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'drop database sa_db',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'show variables like \'server_audit%\'',0 -TIME,HOSTNAME,root,localhost:port,ID,ID,WRITE,mysql,plugin, -TIME,HOSTNAME,root,localhost:port,ID,ID,QUERY,sa_db,'uninstall plugin server_audit',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_logging=on',0 +TIME,HOSTNAME,root,localhost,ID,0,CONNECT,mysql,,0 +TIME,HOSTNAME,root,localhost,ID,0,DISCONNECT,mysql,,0 +TIME,HOSTNAME,no_such_user,localhost,ID,0,FAILED_CONNECT,,,ID +TIME,HOSTNAME,no_such_user,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create table t2 (id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_excl_users=\'odin, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'SHOW WARNINGS',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_incl_users=\'odin, root, dva, tri\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t2, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,ALTER,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,RENAME,test,t1|test.renamed_t1, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'alter table t1 rename renamed_t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'connect,query\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select 1,\n2,\n# comment\n3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t2 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t_doesnt_exist',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'syntax_error_query',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'drop table renamed_t1, t2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'show variables like \'server_audit%\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_mode=1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'set global server_audit_events=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,0,CONNECT,test,,0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create table t1 (id2 int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,DROP,test,t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'use sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,CREATE,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table sa_t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into sa_t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,table_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,column_stats, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,index_stats, +TIME,HOSTNAME,root,localhost,ID,ID,DROP,sa_db,sa_t1, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table sa_t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,event, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,0,DISCONNECT,,,0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'create database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'use sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,db, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,tables_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,columns_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,procs_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proxies_priv, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,roles_mapping, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,global_priv, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'create table t1(id int)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop table t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select * from t1',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'(select 2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD\n# comment\nFOR u1 = PASSWORD(*****)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=',ID +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global serv',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select (1), (2)',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'select \'A\', ',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_query_log_limit= 1024',0 +TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,proc, +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,event, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop database sa_db',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'.\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\' \'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_file_path=\'nonexisting_dir/\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show status like \'server_audit_current_log\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'show variables like \'server_audit%\'',0 +TIME,HOSTNAME,root,localhost,ID,ID,WRITE,mysql,plugin, +TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'uninstall plugin server_audit',0 diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index 4c8bd9017d6..8ad5bb37860 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -171,8 +171,7 @@ set global server_audit_incl_users='user1'; create user user1@localhost; grant all on sa_db.* to user1@localhost; -connect (cn1,localhost,user1,,sa_db); -connection cn1; +connect (cn1,127.0.0.1,user1,,sa_db,$MASTER_MYPORT); create table t1(id int) engine=myisam; insert delayed into t1 values (1); @@ -204,7 +203,6 @@ connect(plug_con,localhost,plug,plug_dest); GRANT PROXY ON plug_dest TO plug; --sleep 2 connect(plug_con,localhost,plug,plug_dest,"*NO-ONE*"); -connection plug_con; select USER(),CURRENT_USER(); connection default; disconnect plug_con; @@ -252,7 +250,7 @@ uninstall plugin server_audit; # replace stored SSL verison with constant string "TLS_VERSION" --replace_result $ssl_version TLS_VERSION # replace the timestamp and the hostname with constant values ---replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/ +--replace_regex /\d* \d\d:\d\d:\d\d\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9]\d*\,/,1,/ /\,[1-9]\d*/,ID/ /:\d+,/:PORT,/ cat_file $MYSQLD_DATADIR/server_audit.log; remove_file $MYSQLD_DATADIR/server_audit.log; --enable_ps2_protocol diff --git a/mysql-test/suite/plugins/t/thread_pool_server_audit.test b/mysql-test/suite/plugins/t/thread_pool_server_audit.test index c532203cc68..aed33c28948 100644 --- a/mysql-test/suite/plugins/t/thread_pool_server_audit.test +++ b/mysql-test/suite/plugins/t/thread_pool_server_audit.test @@ -144,8 +144,11 @@ uninstall plugin server_audit; --enable_ps2_protocol let $MYSQLD_DATADIR= `SELECT @@datadir`; +if ($MARIADB_UPGRADE_EXE) { # windows + let $replace_port= /localhost:\d+/localhost/; +} # replace the timestamp, hostname, and port number with constant values ---replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/ /,localhost:([0-9]+|unavailable)/,localhost:port/ +--replace_regex /\d* \d\d:\d\d:\d\d\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9]\d*\,/,1,/ /\,[1-9]\d*/,ID/ $replace_port cat_file $MYSQLD_DATADIR/server_audit.log; remove_file $MYSQLD_DATADIR/server_audit.log; diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c index 00a1e55e5c1..ae4097a4f73 100644 --- a/plugin/server_audit/server_audit.c +++ b/plugin/server_audit/server_audit.c @@ -15,8 +15,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */ -#define PLUGIN_VERSION 0x104 -#define PLUGIN_STR_VERSION "1.5.14" +#define PLUGIN_VERSION 0x105 +#define PLUGIN_STR_VERSION "1.5.0" #define _my_thread_var loc_thread_var @@ -1458,10 +1458,9 @@ static size_t log_header(char *message, size_t message_len, host= userip; } if (port == 0) { - strncpy(port_str, "unavailable", sizeof(port_str) - 1); - port_str[sizeof(port_str) - 1] = '\0'; + port_str[0] = '\0'; } else { - my_snprintf(port_str, sizeof(port_str), "%u", port); + my_snprintf(port_str, sizeof(port_str), ":%u", port); } /* @@ -1476,7 +1475,7 @@ static size_t log_header(char *message, size_t message_len, if (output_type == OUTPUT_SYSLOG) return my_snprintf(message, message_len, - "%.*s,%.*s,%.*s:%s,%d,%lld,%s", + "%.*s,%.*s,%.*s%s,%d,%lld,%s", (int) serverhost_len, serverhost, username_len, username, host_len, host, port_str, @@ -1484,7 +1483,7 @@ static size_t log_header(char *message, size_t message_len, (void) localtime_r(ts, &tm_time); return my_snprintf(message, message_len, - "%04d%02d%02d %02d:%02d:%02d,%.*s,%.*s,%.*s:%s,%d,%lld,%s", + "%04d%02d%02d %02d:%02d:%02d,%.*s,%.*s,%.*s%s,%d,%lld,%s", tm_time.tm_year+1900, tm_time.tm_mon+1, tm_time.tm_mday, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, (int) serverhost_len, serverhost, @@ -2048,8 +2047,6 @@ static int log_table(const struct connection_info *cn, char message[1024]; time_t ctime; - - (void) time(&ctime); csize= log_header(message, sizeof(message)-1, &ctime, servhost, servhost_len,