From: Steve Singer <ssinger@ca.afilias.info>
Date: Mon, 15 Nov 2010 20:50:05 +0000 (-0500)
Subject: Fixing a merge issue from commit 535565a4cad1e742b8dbdcaeafba4e1d7daf9c38.
X-Git-Tag: REL_2_1_0_B1~78^2
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3cbbaba072b38527fa2ac7949ba680e7bd410a9a;p=slony1-engine.git

Fixing a merge issue from commit 535565a4cad1e742b8dbdcaeafba4e1d7daf9c38.

The change did not match what was in REL_2_0_STABLE and did not work as expected.
This patch has a history of merge issues.
---

diff --git a/src/slon/local_listen.c b/src/slon/local_listen.c
index e2b79ccb..7fe9295c 100644
--- a/src/slon/local_listen.c
+++ b/src/slon/local_listen.c
@@ -133,12 +133,7 @@ localListenThread_main(/* @unused@ */ void *dummy)
 		}
 		PQclear(res);
 		node_lock_obtained=1;
-		dstring_free(&query1);
-		pthread_mutex_lock(&slon_wait_listen_lock);
-		slon_listen_started=0;
-		pthread_cond_signal(&slon_wait_listen_cond);
-		pthread_mutex_unlock(&slon_wait_listen_lock);
-		slon_abort();
+	
 	}
 
 	/*