diff options
| author | Alice Sherepa <alice.sherepa@gmail.com> | 2020-10-29 15:20:48 +0100 |
|---|---|---|
| committer | Alice Sherepa <alice.sherepa@gmail.com> | 2020-11-04 13:23:06 +0100 |
| commit | c048053c8af5083d35f764c5707c0b4ddb549846 (patch) | |
| tree | b6bff5fd978bded7cfc9ad38519c102653d190e6 | |
| parent | 8ba641a6760075199f97d565f6634f4273091070 (diff) | |
| download | mariadb-git-c048053c8af5083d35f764c5707c0b4ddb549846.tar.gz | |
MDEV-23103 rpl.rpl_gtid_delete_domain failed in buildbot
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test | 12 |
2 files changed, 4 insertions, 10 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 74648501fbe..9c36973427a 100644 --- a/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result +++ b/mysql-test/suite/rpl/r/rpl_gtid_delete_domain.result @@ -22,7 +22,7 @@ START SLAVE IO_THREAD; include/wait_for_slave_io_error.inc [errno=1236] connection master; FLUSH BINARY LOGS; -PURGE BINARY LOGS TO 'master-bin.000002';; +include/wait_for_purge.inc "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 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 0262998798a..5537b6fbf86 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_delete_domain.test @@ -53,17 +53,11 @@ START SLAVE IO_THREAD; # adjust the master binlog state FLUSH BINARY LOGS; --let $purge_to_binlog= query_get_value(SHOW MASTER STATUS, File, 1) ---eval PURGE BINARY LOGS TO '$purge_to_binlog'; +--let $purge_binlogs_to=$purge_to_binlog +--source include/wait_for_purge.inc + # with final removal of the extra domain -###adding to debug info to catch the failure (1076): ---error 0,1076 --eval FLUSH BINARY LOGS DELETE_DOMAIN_ID=($extra_domain_id) - -if ($mysql_errno == 1076) { - --echo ### Failure "Could not delete gtid domain" - --source include/show_rpl_debug_info.inc - } - SELECT @@global.gtid_binlog_pos, @@global.gtid_binlog_state; --connection slave |