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

SHOW [FULL] BINARY LOGS is now able to report the same log file in use with different server_ids

Browse Source 
SHOW [FULL] BINARY LOGS is now able to report the same filename in use
with different server_ids: this can happen with binlog_structure=tree

example from SHOW FULL BINARY LOGS

0/10122/mysql-bin.000113
…
0/10122/mysql-bin.000116
…
0/5306/mysql-bin.000113

SHOW BINARY LOGS shows the same file twice:

mysql-bin.000113
…
mysql-bin.000116
…
mysql-bin.000113
This commit is contained in:
MassimilianoPinto
2017-08-03 08:45:13 +02:00
parent 72c5d1844a
commit ae5eb004fe
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/binlogrouter/blr_slave.c
View File

@ -105,6 +105,7 @@ typedef struct
const char *binlogdir; /* Binlog files cache dir */ const char *binlogdir; /* Binlog files cache dir */
bool extra_info; /* Add extra ouput info */ bool extra_info; /* Add extra ouput info */
DCB *client; /* Connected client DCB */ DCB *client; /* Connected client DCB */
bool use_tree; /* Binlog structure type */
} BINARY_LOG_DATA_RESULT; } BINARY_LOG_DATA_RESULT;
extern void poll_fake_write_event(DCB *dcb); extern void poll_fake_write_event(DCB *dcb);
@ -8140,7 +8141,9 @@ blr_show_binary_logs(ROUTER_INSTANCE *router,
"rep_domain, " "rep_domain, "
"server_id " "server_id "
"FROM gtid_maps " "FROM gtid_maps "
"GROUP BY binlog_file " "GROUP BY rep_domain, "
"server_id, "
"binlog_file "
"ORDER BY id ASC;"; "ORDER BY id ASC;";
int seqno; int seqno;
char *errmsg = NULL; char *errmsg = NULL;
@ -8190,6 +8193,7 @@ blr_show_binary_logs(ROUTER_INSTANCE *router,
result.last_file = NULL; result.last_file = NULL;
result.binlogdir = router->binlogdir; result.binlogdir = router->binlogdir;
result.extra_info = extra_info; result.extra_info = extra_info;
result.use_tree = router->storage_type == BLR_BINLOG_STORAGE_TREE;
/** /**
* Second part of result set: * Second part of result set:
@ -8368,11 +8372,11 @@ static int binary_logs_select_cb(void *data,
* Let's get the real size by calling blr_slave_get_file_size() * Let's get the real size by calling blr_slave_get_file_size()
*/ */
// Get filename full-path, use prefix only if requested by the caller // Get filename full-path, use prefix only if binlog_structure is TREE
blr_get_file_fullpath(values[0], blr_get_file_fullpath(values[0],
data_set->binlogdir, data_set->binlogdir,
file_path, file_path,
data_set->extra_info ? data_set->use_tree ?
t_prefix : t_prefix :
NULL); NULL);
//Get the file size //Get the file size