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

Fixed two errors in show slave status output. Master_UUID was

Browse Source 
showing the variable name rather than the value and
Master_SSL_Verify_Server_cert was missing
This commit is contained in:
Mark Riddoch
2015-02-10 10:00:02 +00:00
parent eafdd43592
commit 01eafd92c8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/binlog/blr_master.c
View File

@ -456,7 +456,7 @@ char query[128];
break; break;
case BLRM_MUUID: case BLRM_MUUID:
{ {
char *val = blr_extract_column(buf, 1); char *val = blr_extract_column(buf, 2);
router->master_uuid = val; router->master_uuid = val;
// Response to the SERVER_UUID, should be stored // Response to the SERVER_UUID, should be stored

5
server/modules/routing/binlog/blr_slave.c
View File

@ -689,8 +689,8 @@ static char *slave_status_columns[] = {
"Last_Errno", "Last_Error", "Skip_Counter", "Exec_Master_Log_Pos", "Relay_Log_Space", "Last_Errno", "Last_Error", "Skip_Counter", "Exec_Master_Log_Pos", "Relay_Log_Space",
"Until_Condition", "Until_Log_File", "Until_Log_Pos", "Master_SSL_Allowed", "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_CA_File", "Master_SSL_CA_Path", "Master_SSL_Cert", "Master_SSL_Cipher",
"Master_SSL_Key", "Master_SSL_Key", "Seconds_Behind_Master",
"Seconds_Behind_Master", "Last_IO_Errno", "Last_IO_Error", "Last_SQL_Errno", "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", "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_Info_File", "SQL_Delay", "SQL_Remaining_Delay", "Slave_SQL_Running_State",
"Master_Retry_Count", "Master_Bind", "Last_IO_Error_TimeStamp", "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 strncpy((char *)ptr, column, col_len); // Result string
ptr += col_len; ptr += col_len;
*ptr++ = 0;
*ptr++ = 0; *ptr++ = 0;
/* Master_Server_Id */ /* Master_Server_Id */