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

Modified Files:
	slony1_funcs.sql 
Log Message:
Found another parameter to text casting issue with 8.3.

Jan


Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** slony1_funcs.sql	27 Jul 2007 21:35:36 -0000	1.115
--- slony1_funcs.sql	29 Jul 2007 17:37:34 -0000	1.116
***************
*** 2487,2494 ****
  	if exists (select true from @NAMESPACE at .sl_event
  			where ev_type = ''ENABLE_SUBSCRIPTION''
! 			and ev_data1 = p_add_id
  			and ev_seqno > (select max(con_seqno) from @NAMESPACE at .sl_confirm
  					where con_origin = ev_origin
! 					and con_received = ev_data3))
  	then
  		raise exception ''Slony-I: set % has subscriptions in progress - cannot merge'',
--- 2487,2494 ----
  	if exists (select true from @NAMESPACE at .sl_event
  			where ev_type = ''ENABLE_SUBSCRIPTION''
! 			and ev_data1 = p_add_id::text
  			and ev_seqno > (select max(con_seqno) from @NAMESPACE at .sl_confirm
  					where con_origin = ev_origin
! 					and con_received::text = ev_data3))
  	then
  		raise exception ''Slony-I: set % has subscriptions in progress - cannot merge'',