diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-24 18:24:21 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-24 18:29:17 +0200 |
commit | 9fbe360e9f7d41d169eb5abed22dc15f26f6c749 (patch) | |
tree | f40fbb44175a32e28b08820b8d5235858b1ca10d | |
parent | e0139c2b92ba1f8819a3ed75d020d9665545e2bf (diff) | |
download | mariadb-git-9fbe360e9f7d41d169eb5abed22dc15f26f6c749.tar.gz |
make plugins.processlist more robust
-rw-r--r-- | mysql-test/suite/plugins/r/processlist.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/plugins/t/processlist.test | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mysql-test/suite/plugins/r/processlist.result b/mysql-test/suite/plugins/r/processlist.result index d08ea9d3523..9200c865533 100644 --- a/mysql-test/suite/plugins/r/processlist.result +++ b/mysql-test/suite/plugins/r/processlist.result @@ -1,8 +1,6 @@ create table t1 (a int) engine=innodb; start transaction; insert t1 values (1); -state from show engine innodb status +state from show engine innodb status, must be empty -state from show processlist - drop table t1; diff --git a/mysql-test/suite/plugins/t/processlist.test b/mysql-test/suite/plugins/t/processlist.test index e8f03aacb10..39b715b867b 100644 --- a/mysql-test/suite/plugins/t/processlist.test +++ b/mysql-test/suite/plugins/t/processlist.test @@ -8,11 +8,12 @@ start transaction; insert t1 values (1); let id=`select connection_id()`; connect con2,localhost,root; +let $wait_condition=select state='' from information_schema.processlist where id = $id; +--source include/wait_condition.inc replace_regex /\"/-/; #" let s=`show engine innodb status`; 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 state as `state from show processlist` from information_schema.processlist where id = $id; +eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`; enable_query_log; disconnect con2; connection default; |