From aacd37f7b2a78a9ba8f6b3eb4594c61244ce09e4 Mon Sep 17 00:00:00 2001
From: Christian Kruse <cjk@defunct.ch>
Date: Fri, 9 May 2014 12:01:59 +0200
Subject: [PATCH] bdr: fix: do not use vars named errmsg, generate proper log
 message

---
 contrib/bdr/bdr.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/contrib/bdr/bdr.c b/contrib/bdr/bdr.c
index 8b1768bff5..6e119db9c2 100644
--- a/contrib/bdr/bdr.c
+++ b/contrib/bdr/bdr.c
@@ -785,7 +785,7 @@ bdr_create_con_gucs(char  *name,
 					BdrConnectionConfig **out_config)
 {
 	Size		off;
-	char	   *errmsg = NULL;
+	char	   *errormsg = NULL;
 	PQconninfoOption *options;
 	PQconninfoOption *cur_option;
 	BdrConnectionConfig *opts;
@@ -851,13 +851,14 @@ bdr_create_con_gucs(char  *name,
 
 	elog(DEBUG2, "bdr %s: dsn=%s", name, opts->dsn);
 
-	options = PQconninfoParse(opts->dsn, &errmsg);
-	if (errmsg != NULL)
+	options = PQconninfoParse(opts->dsn, &errormsg);
+	if (errormsg != NULL)
 	{
-		char	   *str = pstrdup(errmsg);
+		char	   *str = pstrdup(errormsg);
 
-		PQfreemem(errmsg);
-		elog(ERROR, "msg: %s", str);
+		PQfreemem(errormsg);
+		ereport(ERROR,
+				(errmsg("bdr %s: error in dsn: %s", name, str)));
 	}
 
 	cur_option = options;
-- 
2.39.5