diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-23 22:10:31 +0200 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-23 22:10:31 +0200 |
| commit | c666ca7b1b61fd924bf10efec4e60c8a06e4fc46 (patch) | |
| tree | 8e9f96cd607d3cbb8444130d064a5395dc8d0479 /mysql-test/suite | |
| parent | e2dd4e32063b2526d951e5f4ddfdb8b0d69ef634 (diff) | |
| download | mariadb-git-c666ca7b1b61fd924bf10efec4e60c8a06e4fc46.tar.gz | |
MDEV-12012. Post-push attempt to catch failure in rpl_gtid_delete_domain failing on P8. The test is made more verbose.
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result | 39 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test | 5 |
2 files changed, 43 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result b/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result index 52e7cb93bec..75a22b78a32 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result @@ -24,8 +24,47 @@ connection master; FLUSH BINARY LOGS; PURGE BINARY LOGS TO 'master-bin.000002';; FLUSH BINARY LOGS DELETE_DOMAIN_ID=(11); +SELECT @@global.gtid_binlog_pos, @@global.gtid_binlog_state; +@@global.gtid_binlog_pos @@global.gtid_binlog_state +0-1-1 0-1-1 connection slave; +SELECT @@global.gtid_slave_pos; +@@global.gtid_slave_pos +0-1-1,11-111-2 include/start_slave.inc +==== BEGIN include/start_slave.inc ==== + con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +START SLAVE; +.==== BEGIN include/wait_for_slave_to_start.inc ==== +. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +..==== BEGIN include/wait_for_slave_io_to_start.inc ==== +.. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +...==== BEGIN include/wait_for_slave_param.inc [Slave_IO_Running] ==== +... con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +Waiting until 'Slave_IO_Running' = 'Yes' [timeout='300', $slave_error_param='Last_IO_Errno'] +[connection slave] +...==== END include/wait_for_slave_param.inc [Slave_IO_Running] ==== +... con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +[connection slave] +..==== END include/wait_for_slave_io_to_start.inc ==== +.. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +..==== BEGIN include/wait_for_slave_sql_to_start.inc ==== +.. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +...==== BEGIN include/wait_for_slave_param.inc [Slave_SQL_Running] ==== +... con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +Waiting until 'Slave_SQL_Running' = 'Yes' [timeout='300', $slave_error_param='1'] +[connection slave] +...==== END include/wait_for_slave_param.inc [Slave_SQL_Running] ==== +... con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +[connection slave] +..==== END include/wait_for_slave_sql_to_start.inc ==== +.. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +[connection slave] +.==== END include/wait_for_slave_to_start.inc ==== +. con='slave' warn='1' qlog='1' rlog='1' aborterr='1' +[connection slave] +==== END include/start_slave.inc ==== + con='slave' warn='1' qlog='1' rlog='1' aborterr='1' connection master; INSERT INTO t SET a=1; connection slave; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test b/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test index 5abedd7eb37..622e66c5263 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test @@ -56,10 +56,13 @@ FLUSH BINARY LOGS; --eval PURGE BINARY LOGS TO '$purge_to_binlog'; # with final removal of the extra domain --eval FLUSH BINARY LOGS DELETE_DOMAIN_ID=($extra_domain_id) - +SELECT @@global.gtid_binlog_pos, @@global.gtid_binlog_state; --connection slave +SELECT @@global.gtid_slave_pos; # start the slave sucessfully +--let rpl_debug=1 --source include/start_slave.inc +--let rpl_debug=0 --connection master # but the following gtid from the *extra* domain will break replication |