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

SHOW FULL BINARY LOGS reports domain_id/server_id prefix only if binlog_structure is TREE

Browse Source 
SHOW FULL BINARY LOGS reports domain_id/server_id prefix only if
binlog_structure is TREE
This commit is contained in:
MassimilianoPinto
2017-08-01 15:49:16 +02:00
parent f301c2ade1
commit 0597b625d3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8144,7 +8144,8 @@ blr_show_binary_logs(ROUTER_INSTANCE *router,
int seqno; int seqno;
char *errmsg = NULL; char *errmsg = NULL;
BINARY_LOG_DATA_RESULT result = {}; BINARY_LOG_DATA_RESULT result = {};
bool extra_info = !strcasecmp(extra_data, "FULL"); bool extra_info = !strcasecmp(extra_data, "FULL") &&
router->storage_type == BLR_BINLOG_STORAGE_TREE;
/* Get current binlog finename and position */ /* Get current binlog finename and position */
spinlock_acquire(&router->binlog_lock); spinlock_acquire(&router->binlog_lock);
@ -8364,17 +8365,19 @@ 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 binlog filename full-path // Get filename full-path, use prefix only if requested by the caller
blr_get_file_fullpath(values[0], blr_get_file_fullpath(values[0],
data_set->binlogdir, data_set->binlogdir,
file_path, file_path,
t_prefix); data_set->extra_info ?
t_prefix :
NULL);
//Get the file size //Get the file size
fsize = blr_slave_get_file_size(file_path); fsize = blr_slave_get_file_size(file_path);
sprintf(file_size, "%" PRIu32 "", fsize); sprintf(file_size, "%" PRIu32 "", fsize);
// Include extra output // Include prefix in the output
if (data_set->extra_info) if (data_set->extra_info)
{ {
sprintf(filename, sprintf(filename,