Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv4314

Modified Files:
      Tag: REL_1_2_STABLE
	remote_worker.c 
Log Message:
Fixed a problem with the setsync tracking in cases where slon does
an internal restart (thereby rereading the pset.ssy_seqno) and ignoring
non-SYNC events because those don't change the sl_setsync table.


Jan


Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.124.2.17
retrieving revision 1.124.2.18
diff -C2 -d -r1.124.2.17 -r1.124.2.18
*** remote_worker.c	20 Jul 2007 19:55:57 -0000	1.124.2.17
--- remote_worker.c	29 Jul 2007 17:29:18 -0000	1.124.2.18
***************
*** 388,395 ****
  						{
  							slon_mkquery(&query1,
! 								"select max(ssy_seqno) from %s.sl_setsync "
  								"  where ssy_setid = %d "
! 								"    and ssy_origin = %d; ",
! 								rtcfg_namespace, pset->set_id, node->no_id);
  							if (query_execute(node, local_dbconn, &query1) < 0)
  								slon_retry();
--- 388,402 ----
  						{
  							slon_mkquery(&query1,
! 								"select max(ssy_seqno) from ("
! 								"select ssy_seqno from %s.sl_setsync "
  								"  where ssy_setid = %d "
! 								"    and ssy_origin = %d "
! 								"union "
! 								"select ev_seqno from %s.sl_event "
! 								"  where ev_origin = %d "
! 								"    and ev_type <> 'SYNC' "
! 								") as S; ",
! 								rtcfg_namespace, pset->set_id, node->no_id,
! 								rtcfg_namespace, node->no_id);
  							if (query_execute(node, local_dbconn, &query1) < 0)
  								slon_retry();