diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-06-15 08:25:09 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-06-15 08:25:09 +0200 |
| commit | f69f3db7f3bbfee42096d781c6a7c43618cc9a34 (patch) | |
| tree | f6eaecd7f8662e529b07eb40a5b77b34121f520a | |
| parent | 4c251af97b5d9fa733fd29434f89c08552098e60 (diff) | |
| parent | 93c039dd3ca1364ee7646ab4ee1e8490f0472d1c (diff) | |
| download | mariadb-git-f69f3db7f3bbfee42096d781c6a7c43618cc9a34.tar.gz | |
Merge branch 'mdev8294' into 10.0
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_000011.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_000011.test b/mysql-test/suite/rpl/t/rpl_000011.test index faad2242235..216e568fc42 100644 --- a/mysql-test/suite/rpl/t/rpl_000011.test +++ b/mysql-test/suite/rpl/t/rpl_000011.test @@ -11,6 +11,12 @@ insert into t1 values(1); sync_slave_with_master; show global status like 'com_insert'; stop slave; +# Temporary work-around for bug MDEV-8301. There is a small window during +# thread exit where the local status values of a thread are counted twice +# in the global status. Remove this wait_condition.inc once MDEV-8301 is +# fixed. +--let $wait_condition= SELECT variable_value=1 FROM information_schema.global_status WHERE variable_name="Com_insert"; +--source include/wait_condition.inc show global status like 'com_insert'; --source include/wait_for_slave_to_stop.inc start slave; |