1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make plugins.processlist more robust

Browse Source
This commit is contained in:
Sergei Golubchik 2018-06-28 09:05:01 +02:00
parent 00ccff48af
commit 78a0646fe4
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/plugins/r/processlist.result
View File

@ -2,10 +2,8 @@ create table t1 (a int) engine=innodb;
start transaction; start transaction;
insert t1 values (1); insert t1 values (1);
connect con2,localhost,root; connect con2,localhost,root;
state from show engine innodb status state from show engine innodb status, must be empty
state from show processlist
disconnect con2; disconnect con2;
connection default; connection default;
drop table t1; drop table t1;

5
mysql-test/suite/plugins/t/processlist.test
View File

@ -8,11 +8,12 @@ start transaction;
insert t1 values (1); insert t1 values (1);
let id=`select connection_id()`; let id=`select connection_id()`;
connect con2,localhost,root; connect con2,localhost,root;
let $wait_condition=select state='' from information_schema.processlist where id = $id;
--source include/wait_condition.inc
replace_regex /\"/-/; #" replace_regex /\"/-/; #"
let s=`show engine innodb status`; let s=`show engine innodb status`;
disable_query_log; disable_query_log;
eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status`; eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`;
eval select state as `state from show processlist` from information_schema.processlist where id = $id;
enable_query_log; enable_query_log;
disconnect con2; disconnect con2;
connection default; connection default;