hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2047 Align variable names

Browse Source 
MARIADB_GTID_ELEMS is called gtid_elms everywhere else.
This commit is contained in:
Johan Wikman
2018-09-24 14:38:38 +03:00
parent 77daf1fbdb
commit cc5e3eb0ac
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlogrouter/blr.hh
View File

@ -513,7 +513,7 @@ typedef struct blfile
int refcnt; /*< Reference count for file */ int refcnt; /*< Reference count for file */
BLCACHE* cache; /*< Record cache for this file */ BLCACHE* cache; /*< Record cache for this file */
SPINLOCK lock; /*< The file lock */ 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 */ struct blfile* next; /*< Next file in list */
} BLFILE; } BLFILE;

10
server/modules/routing/binlogrouter/blr_file.cc
View File

@ -832,8 +832,8 @@ static bool inline blr_is_same_slave_file(const BLFILE* file,
{ {
if (s_tree) if (s_tree)
{ {
return (file->info.domain_id == info->gtid_elms.domain_id) return (file->gtid_elms.domain_id == info->gtid_elms.domain_id)
&& (file->info.server_id == info->gtid_elms.server_id) && (file->gtid_elms.server_id == info->gtid_elms.server_id)
&& (strcmp(file->binlogname, binlog) == 0); && (strcmp(file->binlogname, binlog) == 0);
} }
else else
@ -917,7 +917,7 @@ BLFILE* blr_open_binlog(ROUTER_INSTANCE* router,
/* Store additional file informations */ /* Store additional file informations */
if (info) if (info)
{ {
memcpy(&file->info, memcpy(&file->gtid_elms,
&info->gtid_elms, &info->gtid_elms,
sizeof(MARIADB_GTID_ELEMS)); sizeof(MARIADB_GTID_ELEMS));
} }
@ -1022,7 +1022,7 @@ GWBUF* blr_read_binlog(ROUTER_INSTANCE* router,
/* Check whether is current router file */ /* Check whether is current router file */
if (!blr_compare_binlogs(router, if (!blr_compare_binlogs(router,
&file->info, &file->gtid_elms,
router->binlog_name, router->binlog_name,
file->binlogname)) file->binlogname))
{ {
@ -1059,7 +1059,7 @@ GWBUF* blr_read_binlog(ROUTER_INSTANCE* router,
/* Check current router file and router position */ /* Check current router file and router position */
if (blr_compare_binlogs(router, if (blr_compare_binlogs(router,
&file->info, &file->gtid_elms,
router->binlog_name, router->binlog_name,
file->binlogname) file->binlogname)
&& pos >= router->binlog_position) && pos >= router->binlog_position)