diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result
index 73424a19c08..473114f7207 100644
--- a/mysql-test/suite/plugins/r/server_audit.result
+++ b/mysql-test/suite/plugins/r/server_audit.result
@@ -323,259 +323,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,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=<secret>',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,root,localhost:PORT,ID,ID,QUERY,test,'set global server_audit_logging=on',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,test,'set global server_audit_incl_users= repeat("\'root\',", 10000)',ID
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,test,'show variables like \'server_audit_incl_users\'',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,test,'set global server_audit_excl_users= repeat("\'root\',", 10000)',ID
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,test,'show variables like \'server_audit_excl_users\'',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,global_priv,
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'ALTER 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 procedure pr1() insert into test.t1 values ("foo", 42)',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'create function fn1(i int) returns int deterministic return i+1',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'drop procedure pr1',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'drop function fn1',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=<secret>',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,'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
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'set global server_audit_logging= off',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,'set global server_audit_events=\'\'',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'set global server_audit_incl_users=\'root, plug_dest, ssl_user1\'',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 plug IDENTIFIED WITH \'test_plugin_server\' AS \'plug_dest\'',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 plug_dest IDENTIFIED BY *****',0
+TIME,HOSTNAME,plug,localhost:PORT,ID,0,FAILED_CONNECT,,,ID
+TIME,HOSTNAME,plug,localhost:PORT,ID,0,DISCONNECT,,,0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,WRITE,mysql,proxies_priv,
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,WRITE,mysql,global_priv,
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'GRANT PROXY ON plug_dest TO plug',0
+TIME,HOSTNAME,plug,localhost:PORT,ID,0,CONNECT,,,0
+TIME,HOSTNAME,plug,localhost:PORT,ID,0,PROXY_CONNECT,,`plug_dest`@`%`,0
+TIME,HOSTNAME,plug,localhost:PORT,ID,ID,QUERY,,'select USER(),CURRENT_USER()',0
+TIME,HOSTNAME,plug,localhost:PORT,ID,0,DISCONNECT,,,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 plug',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 plug_dest',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 ssl_user1@localhost require SSL',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 ssl_user1@localhost',0
+TIME,HOSTNAME,ssl_user1,localhost:PORT,ID,0,CONNECT,sa_db,TLS_VERSION,0
+TIME,HOSTNAME,ssl_user1,localhost:PORT,ID,ID,QUERY,sa_db,'SHOW STATUS LIKE \'Ssl_version\'',0
+TIME,HOSTNAME,ssl_user1,localhost:PORT,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:PORT,ID,0,DISCONNECT,sa_db,TLS_VERSION,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 ssl_user1@localhost',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,'select length(\'012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,CREATE,test,t1,
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'CREATE TABLE test.t1 (a char(4))',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'set sql_mode=""',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,sa_db,'insert into test.t1 value("12345")',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'SHOW WARNINGS',0
+TIME,HOSTNAME,root,localhost:PORT,ID,ID,QUERY,sa_db,'set sql_mode=default',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,sa_db,'drop table test.t1',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
 #
 # MDEV-27631 Assertion `global_status_var.global_memory_used == 0' failed in mysqld_exit
 #
diff --git a/mysql-test/suite/plugins/t/server_audit.cnf b/mysql-test/suite/plugins/t/server_audit.cnf
new file mode 100644
index 00000000000..18fc33e30e8
--- /dev/null
+++ b/mysql-test/suite/plugins/t/server_audit.cnf
@@ -0,0 +1,4 @@
+!include include/default_my.cnf
+
+[mysqltest]
+protocol=tcp
diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test
index f2fc500ac20..7987493bac2 100644
--- a/mysql-test/suite/plugins/t/server_audit.test
+++ b/mysql-test/suite/plugins/t/server_audit.test
@@ -1,7 +1,6 @@
 --source include/have_plugin_auth.inc
 --source include/not_embedded.inc
 --source include/have_ssl_communication.inc
---source include/have_tlsv13.inc
 
 if (!$SERVER_AUDIT_SO) {
   skip No SERVER_AUDIT plugin;