Chris Browne cbbrowne at lists.slony.info
Thu Feb 28 11:39:00 PST 2008
Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv8747

Modified Files:
	slony1_funcs.sql 
Log Message:
Fixes found in testing out "testmultipaths"; there were several
references to storenode_int() that were using the old function signature
where nodes had an attribute indicating involvement in logshipping.
Removed the now-spurious boolean parameter.


Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** slony1_funcs.sql	28 Feb 2008 19:23:01 -0000	1.133
--- slony1_funcs.sql	28 Feb 2008 19:38:58 -0000	1.134
***************
*** 1648,1656 ****
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_pa_server) then
! 			perform @NAMESPACE at .storeNode_int (p_pa_server, ''<event pending>'', ''f'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_pa_client) then
! 			perform @NAMESPACE at .storeNode_int (p_pa_client, ''<event pending>'', ''f'');
  		end if;
  		insert into @NAMESPACE at .sl_path
--- 1648,1656 ----
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_pa_server) then
! 			perform @NAMESPACE at .storeNode_int (p_pa_server, ''<event pending>'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_pa_client) then
! 			perform @NAMESPACE at .storeNode_int (p_pa_client, ''<event pending>'');
  		end if;
  		insert into @NAMESPACE at .sl_path
***************
*** 1837,1849 ****
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_origin) then
! 			perform @NAMESPACE at .storeNode_int (p_li_origin, ''<event pending>'', ''f'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_provider) then
! 			perform @NAMESPACE at .storeNode_int (p_li_provider, ''<event pending>'', ''f'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_receiver) then
! 			perform @NAMESPACE at .storeNode_int (p_li_receiver, ''<event pending>'', ''f'');
  		end if;
  
--- 1837,1849 ----
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_origin) then
! 			perform @NAMESPACE at .storeNode_int (p_li_origin, ''<event pending>'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_provider) then
! 			perform @NAMESPACE at .storeNode_int (p_li_provider, ''<event pending>'');
  		end if;
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_li_receiver) then
! 			perform @NAMESPACE at .storeNode_int (p_li_receiver, ''<event pending>'');
  		end if;
  
***************
*** 1988,1992 ****
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_set_origin) then
! 			perform @NAMESPACE at .storeNode_int (p_set_origin, ''<event pending>'', ''f'');
  		end if;
  		insert into @NAMESPACE at .sl_set
--- 1988,1992 ----
  		if not exists (select 1 from @NAMESPACE at .sl_node
  						where no_id = p_set_origin) then
! 			perform @NAMESPACE at .storeNode_int (p_set_origin, ''<event pending>'');
  		end if;
  		insert into @NAMESPACE at .sl_set



More information about the Slony1-commit mailing list