summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2021-09-06 08:47:54 +1000
committerDaniel Black <daniel@mariadb.org>2021-09-06 08:47:58 +1000
commit21d31b9970ee55404ec182ae08503074896cdb84 (patch)
tree21335d304dc5a79e22aeba9e26a2c46ce477ee0b
parentf55477060c008dfef1f27768d5ce45d87f26af34 (diff)
downloadmariadb-git-21d31b9970ee55404ec182ae08503074896cdb84.tar.gz
MDEV-26529: binlog.binlog_flush_binlogs_delete_domain fails on RISC-Vbb-10.2-danielblack-MDEV-26529-riscv-test-fail
Per https://bugs.gentoo.org/807995 The test failed with: CURRENT_TEST: binlog.binlog_flush_binlogs_delete_domain — /tmp/mariadb-10.5.11/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result 2021-06-18 18:19:11.000000000 +0800 +++ /tmp/mariadb-10.5.11/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.reject 2021-09-01 22:55:29.406655479 +0800 @@ -85,6 +85,6 @@ ERROR HY000: The value of gtid domain being deleted ('4294967296') exceeds its maximum size of 32 bit unsigned integer FLUSH BINARY LOGS DELETE_DOMAIN_ID = (4294967295); Warnings: -Warning 1076 The gtid domain being deleted ('4294967295') is not in the current binlog state +Warning 1076 The gtid domain being deleted ('18446744073709551615') is not in the current binlog state DROP TABLE t; RESET MASTER; mysqltest: Result length mismatch ptr_domain_id is a uint32* so explicitly cast this when printing it out. Thanks Marek Szuba for the bug report and testing the patch.
-rw-r--r--sql/rpl_gtid.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index a8f7641fce4..86de093b72a 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.cc
@@ -1859,7 +1859,7 @@ rpl_binlog_state::drop_domain(DYNAMIC_ARRAY *ids,
push_warning_printf(current_thd, Sql_condition::WARN_LEVEL_WARN,
ER_BINLOG_CANT_DELETE_GTID_DOMAIN,
"The gtid domain being deleted ('%lu') is not in "
- "the current binlog state", *ptr_domain_id);
+ "the current binlog state", (unsigned long) *ptr_domain_id);
continue;
}