diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-06-14 14:44:09 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-06-14 14:44:09 +0400 |
| commit | 1b50d599606244677215fbe7b05be1a891fecf18 (patch) | |
| tree | 0d52eca1e0c997cba1a512c7af8d72abea8e02db | |
| parent | d6a1bae57f369d6d1781b94696b87e81e39be4ca (diff) | |
| download | mariadb-git-1b50d599606244677215fbe7b05be1a891fecf18.tar.gz | |
MDEV-9945 - main.kill_processlist-6619 fails sporadically
SHOW PROCESSLIST output can be affected by not completed concurrent KILL QUERY.
Filter out more column values to make output stable.
| -rw-r--r-- | mysql-test/r/kill_processlist-6619.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/kill_processlist-6619.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/kill_processlist-6619.result b/mysql-test/r/kill_processlist-6619.result index a3d971e2115..f14727f1696 100644 --- a/mysql-test/r/kill_processlist-6619.result +++ b/mysql-test/r/kill_processlist-6619.result @@ -6,5 +6,5 @@ SHOW PROCESSLIST; ERROR 70100: Query execution was interrupted SHOW PROCESSLIST; Id User Host db Command Time State Info Progress -# root # test Sleep # # NULL 0.000 -# root # test Query # # SHOW PROCESSLIST 0.000 +# root # test # # # # 0.000 +# root # test # # # # 0.000 diff --git a/mysql-test/t/kill_processlist-6619.test b/mysql-test/t/kill_processlist-6619.test index d73859ce8cd..28f98bcbb24 100644 --- a/mysql-test/t/kill_processlist-6619.test +++ b/mysql-test/t/kill_processlist-6619.test @@ -11,5 +11,5 @@ eval KILL QUERY $con_id; --connection con1 --error ER_QUERY_INTERRUPTED SHOW PROCESSLIST; ---replace_column 1 # 3 # 6 # 7 # +--replace_column 1 # 3 # 5 # 6 # 7 # 8 # SHOW PROCESSLIST; |