diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-01-25 22:58:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-01-25 22:58:57 +0100 |
| commit | f4faac4d6ad31acc96b9edf8c322f3031123dfe0 (patch) | |
| tree | 8c7b112e3464149928db6b0bb7c7ddd9067f69c9 /mysql-test/extra | |
| parent | 2ff65ba53190ad897fc41f546fc4a7bdc80d9054 (diff) | |
| parent | 666b9663f94c2a4f39d331b28fabd09f2dc43bf2 (diff) | |
| download | mariadb-git-f4faac4d6ad31acc96b9edf8c322f3031123dfe0.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_flsh_tbls.test | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test index 5cbda2d591f..a8cec3d2a1a 100644 --- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test +++ b/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test @@ -45,7 +45,13 @@ drop table t1; connection slave; flush tables with read lock; start slave; -source include/wait_for_slave_to_start.inc; + +# The IO thread will not be able to read the GTID because of flush tables +let $slave_param= Slave_IO_Running; +let $slave_param_value= Preparing; +source include/wait_for_slave_param.inc; + +--source include/wait_for_slave_sql_to_start.inc --error 1192 stop slave; |