mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-11675 fixup: Fill in the GTID TODO

Browse source 
Fill in the `todo:gtid` in `check_and_remove_stale_alter`
(Note that `Master_info::master_id` is a `ulong`,
 unlike `rpl_gtid::server_id`)

> We could have caught this before MDEV-11675 was
> published if we'd had this validation earlier 😇 .
> ⸺ Brandon, reply in #3360 (MDEV-21978)

Co-authored-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
This commit is contained in:
ParadoxV5 2024-11-14 19:01:07 -07:00 committed by Daniel Black
parent 687377633d
commit 79cc0f9f78
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/log_event_server.cc
View file

@ -2705,10 +2705,10 @@ static void check_and_remove_stale_alter(Relay_log_info *rli)
{
DBUG_ASSERT(info->state == start_alter_state::REGISTERED);
sql_print_warning("ALTER query started at %llu-%u-%u could not "
sql_print_warning("ALTER query started at %u-%lu-%llu could not "
"be completed because of unexpected master server "
"or its binlog change", info->sa_seq_no, // todo:gtid
0, 0);
"or its binlog change", info->domain_id,
mi->master_id, info->sa_seq_no);
info_iterator.remove();
mysql_mutex_lock(&mi->start_alter_lock);
info->state= start_alter_state::ROLLBACK_ALTER;