github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make variable local to code block

Browse Source
This commit is contained in:
Ian Barwick
2019-11-15 10:46:24 +09:00
parent 21475b9c70
commit f158e35c13
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
repmgr-client.c
View File

@@ -3883,7 +3883,6 @@ check_node_can_attach(TimeLineID local_tli, XLogRecPtr local_xlogpos, PGconn *fo
t_conninfo_param_list follow_target_repl_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER; t_conninfo_param_list follow_target_repl_conninfo = T_CONNINFO_PARAM_LIST_INITIALIZER;
PGconn *follow_target_repl_conn = NULL; PGconn *follow_target_repl_conn = NULL;
t_system_identification follow_target_identification = T_SYSTEM_IDENTIFICATION_INITIALIZER; t_system_identification follow_target_identification = T_SYSTEM_IDENTIFICATION_INITIALIZER;
TimeLineHistoryEntry *follow_target_history = NULL;
bool success = true; bool success = true;
const char *action = is_rejoin == true ? "rejoin" : "follow"; const char *action = is_rejoin == true ? "rejoin" : "follow";
@@ -4001,7 +4000,8 @@ check_node_can_attach(TimeLineID local_tli, XLogRecPtr local_xlogpos, PGconn *fo
/* /*
* upstream has higher timeline - check where it forked off from this node's timeline * upstream has higher timeline - check where it forked off from this node's timeline
*/ */
follow_target_history = get_timeline_history(follow_target_repl_conn, local_tli + 1); TimeLineHistoryEntry *follow_target_history = get_timeline_history(follow_target_repl_conn,
local_tli + 1);
if (follow_target_history == NULL) if (follow_target_history == NULL)
{ {
@@ -4065,13 +4065,12 @@ check_node_can_attach(TimeLineID local_tli, XLogRecPtr local_xlogpos, PGconn *fo
format_lsn(follow_target_history->end)); format_lsn(follow_target_history->end));
} }
} }
pfree(follow_target_history);
} }
PQfinish(follow_target_repl_conn); PQfinish(follow_target_repl_conn);
if (follow_target_history)
pfree(follow_target_history);
return success; return success;
} }