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

MXS-2047 Rename MARIADB_GTID_INFO::file -> binlog_name

Browse Source 
That's how the concept is named elsewhere.
This commit is contained in:
Johan Wikman
2018-09-24 15:35:20 +03:00
parent 654d3f2bbe
commit 25038432bb
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -7190,7 +7190,7 @@ static bool blr_slave_gtid_request(ROUTER_INSTANCE* router,
slave->serverid,
f_gtid.gtid_elms.domain_id,
f_gtid.gtid_elms.server_id,
f_gtid.file,
f_gtid.binlog_name,
f_gtid.start,
f_gtid.end);
@ -7202,10 +7202,10 @@ static bool blr_slave_gtid_request(ROUTER_INSTANCE* router,
* if the requested binlog file is equal to GTID info file use it.
*/
if (!req_file
|| (strcmp(slave->binlog_name, f_gtid.file) == 0))
|| (strcmp(slave->binlog_name, f_gtid.binlog_name) == 0))
{
/* Set binlog file to the GTID one */
strcpy(slave->binlog_name, f_gtid.file);
strcpy(slave->binlog_name, f_gtid.binlog_name);
/* Set pos to GTID next event pos */
slave->binlog_pos = f_gtid.end;
@ -7245,7 +7245,7 @@ static bool blr_slave_gtid_request(ROUTER_INSTANCE* router,
else
{
/* Set binlog file to the GTID one */
strcpy(slave->binlog_name, f_gtid.file);
strcpy(slave->binlog_name, f_gtid.binlog_name);
/* Set pos to GTID next event pos */
slave->binlog_pos = f_gtid.end;