From 01eafd92c832a2d905e82b1be833267b4c590135 Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Tue, 10 Feb 2015 10:00:02 +0000 Subject: [PATCH] Fixed two errors in show slave status output. Master_UUID was showing the variable name rather than the value and Master_SSL_Verify_Server_cert was missing --- server/modules/routing/binlog/blr_master.c | 2 +- server/modules/routing/binlog/blr_slave.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c index 5733463bf..cb0da38e3 100644 --- a/server/modules/routing/binlog/blr_master.c +++ b/server/modules/routing/binlog/blr_master.c @@ -456,7 +456,7 @@ char query[128]; break; case BLRM_MUUID: { - char *val = blr_extract_column(buf, 1); + char *val = blr_extract_column(buf, 2); router->master_uuid = val; // Response to the SERVER_UUID, should be stored diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c index 1ae1434a4..803be8770 100644 --- a/server/modules/routing/binlog/blr_slave.c +++ b/server/modules/routing/binlog/blr_slave.c @@ -689,8 +689,8 @@ static char *slave_status_columns[] = { "Last_Errno", "Last_Error", "Skip_Counter", "Exec_Master_Log_Pos", "Relay_Log_Space", "Until_Condition", "Until_Log_File", "Until_Log_Pos", "Master_SSL_Allowed", "Master_SSL_CA_File", "Master_SSL_CA_Path", "Master_SSL_Cert", "Master_SSL_Cipher", - "Master_SSL_Key", - "Seconds_Behind_Master", "Last_IO_Errno", "Last_IO_Error", "Last_SQL_Errno", + "Master_SSL_Key", "Seconds_Behind_Master", + "Master_SSL_Verify_Server_Cert", "Last_IO_Errno", "Last_IO_Error", "Last_SQL_Errno", "Last_SQL_Error", "Replicate_Ignore_Server_Ids", "Master_Server_Id", "Master_UUID", "Master_Info_File", "SQL_Delay", "SQL_Remaining_Delay", "Slave_SQL_Running_State", "Master_Retry_Count", "Master_Bind", "Last_IO_Error_TimeStamp", @@ -897,6 +897,7 @@ int len, actual_len, col_len, seqno, ncols, i; strncpy((char *)ptr, column, col_len); // Result string ptr += col_len; + *ptr++ = 0; *ptr++ = 0; /* Master_Server_Id */