Skip to content

Commit

Permalink
Bug#29769293: ERROR 1236 "MASTER HAS PURGED BINARY LOGS CONTAINING GT…
Browse files Browse the repository at this point in the history
…IDS": GTID NOT LOGGED

Stabilize the test rpl_gtid_deleted_binlog_fail_to_connect.test on Windows.

Reviewed by: Pedro Gomes <pedro.gomes@oracle.com>
  • Loading branch information
vpvenugo committed Nov 20, 2019
1 parent cbd8769 commit 8199ed9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Expand Up @@ -59,8 +59,6 @@ RESET MASTER;
RESET SLAVE;
[connection master]
RESET MASTER;
Warnings:
Warning 1612 Being purged log ./master-bin.000001 was not found
[connection slave]
include/start_slave.inc
[connection master]
Expand Down
Expand Up @@ -132,6 +132,7 @@ CALL mtr.add_suppression("Got fatal error 1236 from master.*Replicate the missin
--echo #
--echo # 7) Cleanup.
--echo #
--disable_warnings
RESET MASTER;
RESET SLAVE;
--source include/rpl_connection_master.inc
Expand All @@ -141,4 +142,5 @@ RESET MASTER;
--source include/rpl_connection_master.inc
DROP TABLE t1;
--source include/sync_slave_sql_with_master.inc
--enable_warnings
--source include/rpl_end.inc
4 changes: 2 additions & 2 deletions sql/binlog.cc
Expand Up @@ -7795,7 +7795,7 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const Gtid_set* slave_executed_g

/* Buffer for formatting the message about the missing GTIDs. */
static char buff[MYSQL_ERRMSG_SIZE];
snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
my_snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
*errmsg= const_cast<const char*>(buff);

my_free(missing_gtids);
Expand Down Expand Up @@ -7869,7 +7869,7 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_set* previous_gtid_set,
" GTID_SUBTRACT");
/* Buffer for formatting the message about the missing GTIDs. */
static char buff[MYSQL_ERRMSG_SIZE];
snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
my_snprintf(buff, MYSQL_ERRMSG_SIZE, *errmsg, gtid_info.str().c_str());
*errmsg= const_cast<const char*>(buff);

my_free(missing_gtids);
Expand Down

0 comments on commit 8199ed9

Please sign in to comment.