diff options
| author | HF <holyfoot@mariadb.com> | 2019-11-29 21:25:52 +0000 |
|---|---|---|
| committer | HF <holyfoot@mariadb.com> | 2019-11-29 21:25:52 +0000 |
| commit | 3fb0fe400c3f6eb8f4d9f34e81db5516f4ecf3dc (patch) | |
| tree | deffd30a02e7377acb530950e2111b27bffaa024 /mysql-test/suite/plugins | |
| parent | bd11bd63ccbfa71dbd359314db6c4f116629a357 (diff) | |
| download | mariadb-git-3fb0fe400c3f6eb8f4d9f34e81db5516f4ecf3dc.tar.gz | |
MENT-510 Failing test(s): perfschema.threads_insert_delayed.
orig_test_id should be set properly.
Also fixed sporadic test failure.
Diffstat (limited to 'mysql-test/suite/plugins')
| -rw-r--r-- | mysql-test/suite/plugins/r/server_audit.result | 15 | ||||
| -rw-r--r-- | mysql-test/suite/plugins/t/server_audit.test | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result index fcfa5dd2582..7da9c840202 100644 --- a/mysql-test/suite/plugins/r/server_audit.result +++ b/mysql-test/suite/plugins/r/server_audit.result @@ -223,11 +223,11 @@ insert delayed into t1 values (1), (2); connection default; # Waiting until INSERT DELAYED thread does the insert. drop table t1; -disconnect cn1; -drop user user1@localhost; set global server_audit_logging= off; -set global server_audit_incl_users=''; +set global server_audit_incl_users='root'; set global server_audit_logging= on; +disconnect cn1; +drop user user1@localhost; set global server_audit_events=''; set global server_audit_query_log_limit= 15; select (1), (2), (3), (4); @@ -264,7 +264,7 @@ server_audit_file_path server_audit_file_rotate_now OFF server_audit_file_rotate_size 1000000 server_audit_file_rotations 9 -server_audit_incl_users +server_audit_incl_users root server_audit_logging ON server_audit_mode 1 server_audit_output_type file @@ -398,6 +398,13 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)', TIME,HOSTNAME,user1,localhost,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,user, +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,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 diff --git a/mysql-test/suite/plugins/t/server_audit.test b/mysql-test/suite/plugins/t/server_audit.test index abba7d2b74f..67b855871a3 100644 --- a/mysql-test/suite/plugins/t/server_audit.test +++ b/mysql-test/suite/plugins/t/server_audit.test @@ -152,12 +152,12 @@ connection default; let $wait_condition= SELECT COUNT(*) = 2 FROM t1; --source include/wait_condition.inc drop table t1; -disconnect cn1; -drop user user1@localhost; set global server_audit_logging= off; -set global server_audit_incl_users=''; +set global server_audit_incl_users='root'; set global server_audit_logging= on; +disconnect cn1; +drop user user1@localhost; set global server_audit_events=''; |