diff --git a/server/modules/routing/binlogrouter/blr.hh b/server/modules/routing/binlogrouter/blr.hh index 1ac6363ae..8eff2d53d 100644 --- a/server/modules/routing/binlogrouter/blr.hh +++ b/server/modules/routing/binlogrouter/blr.hh @@ -513,7 +513,7 @@ typedef struct blfile int refcnt; /*< Reference count for file */ BLCACHE* cache; /*< Record cache for this file */ SPINLOCK lock; /*< The file lock */ - MARIADB_GTID_ELEMS info; /*< Elements for file prefix */ + MARIADB_GTID_ELEMS gtid_elms; /*< Elements for file prefix */ struct blfile* next; /*< Next file in list */ } BLFILE; diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc index aba8bb534..d649c6b48 100644 --- a/server/modules/routing/binlogrouter/blr_file.cc +++ b/server/modules/routing/binlogrouter/blr_file.cc @@ -832,8 +832,8 @@ static bool inline blr_is_same_slave_file(const BLFILE* file, { if (s_tree) { - return (file->info.domain_id == info->gtid_elms.domain_id) - && (file->info.server_id == info->gtid_elms.server_id) + return (file->gtid_elms.domain_id == info->gtid_elms.domain_id) + && (file->gtid_elms.server_id == info->gtid_elms.server_id) && (strcmp(file->binlogname, binlog) == 0); } else @@ -917,7 +917,7 @@ BLFILE* blr_open_binlog(ROUTER_INSTANCE* router, /* Store additional file informations */ if (info) { - memcpy(&file->info, + memcpy(&file->gtid_elms, &info->gtid_elms, sizeof(MARIADB_GTID_ELEMS)); } @@ -1022,7 +1022,7 @@ GWBUF* blr_read_binlog(ROUTER_INSTANCE* router, /* Check whether is current router file */ if (!blr_compare_binlogs(router, - &file->info, + &file->gtid_elms, router->binlog_name, file->binlogname)) { @@ -1059,7 +1059,7 @@ GWBUF* blr_read_binlog(ROUTER_INSTANCE* router, /* Check current router file and router position */ if (blr_compare_binlogs(router, - &file->info, + &file->gtid_elms, router->binlog_name, file->binlogname) && pos >= router->binlog_position)