database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MENT-510 Failing test(s): perfschema.threads_insert_delayed.

Browse Source 
orig_test_id should be set properly.
Also fixed sporadic test failure.
This commit is contained in:
HF
2019-11-29 21:25:52 +00:00
parent bd11bd63cc
commit 3fb0fe400c
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/plugins/r/server_audit.result
View File

@ -223,11 +223,11 @@ insert delayed into t1 values (1), (2);
connection default; connection default;
# Waiting until INSERT DELAYED thread does the insert. # Waiting until INSERT DELAYED thread does the insert.
drop table t1; drop table t1;
set global server_audit_logging= off;
set global server_audit_incl_users='root';
set global server_audit_logging= on;
disconnect cn1; disconnect cn1;
drop user user1@localhost; drop user user1@localhost;
set global server_audit_logging= off;
set global server_audit_incl_users='';
set global server_audit_logging= on;
set global server_audit_events=''; set global server_audit_events='';
set global server_audit_query_log_limit= 15; set global server_audit_query_log_limit= 15;
select (1), (2), (3), (4); select (1), (2), (3), (4);
@ -264,7 +264,7 @@ server_audit_file_path
server_audit_file_rotate_now OFF server_audit_file_rotate_now OFF
server_audit_file_rotate_size 1000000 server_audit_file_rotate_size 1000000
server_audit_file_rotations 9 server_audit_file_rotations 9
server_audit_incl_users server_audit_incl_users root
server_audit_logging ON server_audit_logging ON
server_audit_mode 1 server_audit_mode 1
server_audit_output_type file 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,CREATE,sa_db,t1,
TIME,HOSTNAME,user1,localhost,ID,ID,WRITE,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,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 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,'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 (1), (2)',0

6
mysql-test/suite/plugins/t/server_audit.test
View File

@ -152,12 +152,12 @@ connection default;
let $wait_condition= SELECT COUNT(*) = 2 FROM t1; let $wait_condition= SELECT COUNT(*) = 2 FROM t1;
--source include/wait_condition.inc --source include/wait_condition.inc
drop table t1; drop table t1;
disconnect cn1;
drop user user1@localhost;
set global server_audit_logging= off; 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; set global server_audit_logging= on;
disconnect cn1;
drop user user1@localhost;
set global server_audit_events=''; set global server_audit_events='';

1
sql/sql_insert.cc
View File

@ -2104,6 +2104,7 @@ public:
status(0), retry(0), handler_thread_initialized(FALSE), group_count(0) status(0), retry(0), handler_thread_initialized(FALSE), group_count(0)
{ {
DBUG_ENTER("Delayed_insert constructor"); DBUG_ENTER("Delayed_insert constructor");
orig_thread_id= thd.thread_id;
set_default_user(); set_default_user();
strmake_buf(thd.security_ctx->priv_user, thd.security_ctx->user); strmake_buf(thd.security_ctx->priv_user, thd.security_ctx->user);
thd.current_tablenr=0; thd.current_tablenr=0;