projects
/
slony1-engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40da388
)
Fixing a merge issue from commit 535565a4cad1e742b8dbdcaeafba4e1d7daf9c38.
author
Steve Singer
<ssinger@ca.afilias.info>
Mon, 15 Nov 2010 20:50:05 +0000
(15:50 -0500)
committer
Steve Singer
<ssinger@ca.afilias.info>
Mon, 15 Nov 2010 20:52:59 +0000
(15:52 -0500)
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.
src/slon/local_listen.c
patch
|
blob
|
blame
|
history
diff --git
a/src/slon/local_listen.c
b/src/slon/local_listen.c
index e2b79ccbf64ef5c75b76f13525c72a2f8e3115e1..7fe9295cfef88d1a10815633d24dd42a8abc6084 100644
(file)
--- 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();
+
}
/*