cloneFinish() changes the sequence sl_local_node_id but the value
is cached in the C functions per session.  If getLocalNodeId()
has already been called in the current session cloneNode will
do the wrong thing because subsequent calls to getLocalNodeId()
will return the old value.

With the auto-wait-for changes slonik typically calls
getLocalNodeId() before submitting commands this exposes
this bug.

Here we provide a C function that resets the cluster status
and have the cloneNode function call this after changing
the sl_local_node_id value.
---
 src/backend/slony1_funcs.c   |   43 +++++++++++++++++++++++++++++++++++++++++-
 src/backend/slony1_funcs.sql |    7 +++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/backend/slony1_funcs.c b/src/backend/slony1_funcs.c
index 863c23a..107cf53 100644
--- a/src/backend/slony1_funcs.c
+++ b/src/backend/slony1_funcs.c
@@ -60,7 +60,7 @@ PG_FUNCTION_INFO_V1(_Slony_I_killBackend);
 PG_FUNCTION_INFO_V1(_Slony_I_seqtrack);
 
 PG_FUNCTION_INFO_V1(_slon_quote_ident);
-
+PG_FUNCTION_INFO_V1(_Slony_I_resetSession);
 
 Datum		_Slony_I_createEvent(PG_FUNCTION_ARGS);
 Datum		_Slony_I_getLocalNodeId(PG_FUNCTION_ARGS);
@@ -74,6 +74,8 @@ Datum		_Slony_I_seqtrack(PG_FUNCTION_ARGS);
 
 Datum		_slon_quote_ident(PG_FUNCTION_ARGS);
 
+Datum		_Slony_I_resetSession(PG_FUNCTION_ARGS);
+
 #ifdef CYGWIN
 extern DLLIMPORT Node *newNodeMacroHolder;
 #endif
@@ -1402,6 +1404,45 @@ getClusterStatus(Name cluster_name, int need_plan_mask)
 	/* @+nullderef@ */
 }
 
+Datum
+_Slony_I_resetSession(PG_FUNCTION_ARGS)
+{
+  Slony_I_ClusterStatus *cs;
+  
+  cs = clusterStatusList; 
+  while(cs != NULL)
+  {
+	  Slony_I_ClusterStatus *previous;
+	  if(cs->cmdtype_I)
+		  free(cs->cmdtype_I);
+	  if(cs->cmdtype_D)
+		  free(cs->cmdtype_D);
+	  if(cs->cmdtype_U)
+		  free(cs->cmdtype_D);
+	  if(cs->cmddata_buf)
+		  free(cs->cmddata_buf);
+	  free(cs->clusterident);
+	  if(cs->plan_insert_event)
+		  SPI_freeplan(cs->plan_insert_event);
+	  if(cs->plan_insert_log_1)
+		  SPI_freeplan(cs->plan_insert_log_1);
+	  if(cs->plan_insert_log_2)
+		  SPI_freeplan(cs->plan_insert_log_2);
+	  if(cs->plan_record_sequences)
+		  SPI_freeplan(cs->plan_record_sequences);
+	  if(cs->plan_get_logstatus)
+		  SPI_freeplan(cs->plan_get_logstatus);
+	  previous=cs;
+	  cs=cs->next;
+	  free(previous);
+
+
+  }
+  clusterStatusList=NULL;
+  PG_RETURN_NULL();
+
+}
+
 
 /*
  * Local Variables:
diff --git a/src/backend/slony1_funcs.sql b/src/backend/slony1_funcs.sql
index 671a0a9..4c3c8ea 100644
--- a/src/backend/slony1_funcs.sql
+++ b/src/backend/slony1_funcs.sql
@@ -179,6 +179,11 @@ grant execute on function @NAMESPACE at .getModuleVersion () to public;
 comment on function @NAMESPACE at .getModuleVersion () is
   'Returns the compiled-in version number of the Slony-I shared object';
 
+
+create or replace function @NAMESPACE at .resetSession() returns text
+	   as '$libdir/slony1_funcs','_Slony_I_resetSession'
+	   language C;
+
 create or replace function @NAMESPACE at .checkmoduleversion () returns text as $$
 declare
   moduleversion	text;
@@ -1526,7 +1531,7 @@ declare
 	v_row			record;
 begin
 	perform "pg_catalog".setval('@NAMESPACE at .sl_local_node_id', p_no_id);
-
+	perform @NAMESPACE at .resetSession();
 	for v_row in select sub_set from @NAMESPACE at .sl_subscribe
 			where sub_receiver = p_no_id
 	loop
-- 
1.7.0.4


--------------030003050705060406010108--