Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main:/tmp/cvs-serv10578/src/backend

Modified Files:
      Tag: REL_1_1_STABLE
	Makefile slony1_funcs.sql slony1_funcs.v73.sql 
	slony1_funcs.v74.sql slony1_funcs.v80.sql 
Log Message:
For 1_1_STABLE:

- Add notes to release notes
- Change version to 1.1.7 (the next version)
- Need to have v81.sql files
- Fix typo in generate_sync_event()
- Add to upgrade the make_function_strict() request on xxidin function
- Add variable - remote_listen_timeout


Index: Makefile
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/Makefile,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** Makefile	10 Nov 2005 23:39:32 -0000	1.19.2.1
--- Makefile	8 Feb 2007 22:52:40 -0000	1.19.2.2
***************
*** 30,33 ****
--- 30,36 ----
  FUNCS_80		= slony1_funcs.v80.sql
  
+ BASE_81			= slony1_base.v81.sql
+ FUNCS_81		= slony1_funcs.v81.sql
+ 
  SQL_NAMES =				\
  	$(BASE_COMMON)		\
***************
*** 38,42 ****
  	$(FUNCS_74)			\
  	$(BASE_80)			\
! 	$(FUNCS_80)
  
  DISTFILES = Makefile README README.events $(wildcard *.sql) $(wildcard *.in) $(wildcard *.c)
--- 41,47 ----
  	$(FUNCS_74)			\
  	$(BASE_80)			\
! 	$(FUNCS_80)			\
! 	$(BASE_81)			\
! 	$(FUNCS_81)
  
  DISTFILES = Makefile README README.events $(wildcard *.sql) $(wildcard *.in) $(wildcard *.c)

Index: slony1_funcs.v73.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.v73.sql,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -C2 -d -r1.7.2.3 -r1.7.2.4
*** slony1_funcs.v73.sql	6 Jan 2006 17:07:46 -0000	1.7.2.3
--- slony1_funcs.v73.sql	8 Feb 2007 22:52:40 -0000	1.7.2.4
***************
*** 103,104 ****
--- 103,114 ----
  'Returns 1/0 based on whether or not the DB is running a
  version earlier than 7.4';
+ 
+ create or replace function @NAMESPACE at .make_function_strict (text, text) returns void as
+ '
+    update "pg_catalog"."pg_proc" set proisstrict = ''t'' where 
+         proname = $1 and pronamespace = (select oid from "pg_catalog"."pg_namespace" where nspname = '_ at CLUSTERNAME@') and prolang = (select oid from "pg_catalog"."pg_language" where lanname = ''c'');
+ ' language sql;
+ 
+ comment on function @NAMESPACE at .make_function_strict (text, text) is
+ 'Equivalent to 8.1+ ALTER FUNCTION ... STRICT';
+ 

Index: slony1_funcs.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.sql,v
retrieving revision 1.64.2.20
retrieving revision 1.64.2.21
diff -C2 -d -r1.64.2.20 -r1.64.2.21
*** slony1_funcs.sql	5 Feb 2007 22:18:06 -0000	1.64.2.20
--- slony1_funcs.sql	8 Feb 2007 22:52:40 -0000	1.64.2.21
***************
*** 414,418 ****
  as '
  begin
! 	return 6;
  end;
  ' language plpgsql;
--- 414,418 ----
  as '
  begin
! 	return 7;
  end;
  ' language plpgsql;
***************
*** 4301,4305 ****
  				ev_origin = v_min_row.ev_origin and
  				ev_seqno < v_min_row.ev_seqno;
- 
  	end if;
  	-- ----
--- 4301,4304 ----
***************
*** 4916,4924 ****
  BEGIN
  	select 1 into v_node_row from @NAMESPACE at .sl_event 
!        	  where ev_type = ''SYNC'' and ev_origin = @NAMESPACE at .getLocalNodeId(''@NAMESPACE@'')
            and ev_timestamp > now() - p_interval limit 1;
  	if not found then
  		-- If there has been no SYNC in the last interval, then push one
! 		perform @NAMESPACE at .createEvent(''@NAMESPACE@'', ''SYNC'', NULL);
  		return 1;
  	else
--- 4915,4923 ----
  BEGIN
  	select 1 into v_node_row from @NAMESPACE at .sl_event 
!        	  where ev_type = ''SYNC'' and ev_origin = @NAMESPACE at .getLocalNodeId(''_ at CLUSTERNAME@'')
            and ev_timestamp > now() - p_interval limit 1;
  	if not found then
  		-- If there has been no SYNC in the last interval, then push one
! 		perform @NAMESPACE at .createEvent(''_ at CLUSTERNAME@'', ''SYNC'', NULL);
  		return 1;
  	else
***************
*** 5206,5209 ****
--- 5205,5210 ----
  	end if;
  
+ 	-- In any version, make sure that the xxidin() functions are defined STRICT
+ 	perform @NAMESPACE at .make_function_strict (''xxidin'', ''(cstring)'');
  	return p_old;
  end;
***************
*** 5279,5280 ****
--- 5280,5282 ----
  
  In PG versions > 7.3, this looks like (field1,field2,...fieldn)';
+ 

Index: slony1_funcs.v80.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.v80.sql,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** slony1_funcs.v80.sql	6 Jan 2006 17:07:46 -0000	1.1.2.2
--- slony1_funcs.v80.sql	8 Feb 2007 22:52:40 -0000	1.1.2.3
***************
*** 114,115 ****
--- 114,127 ----
  'Returns 1/0 based on whether or not the DB is running a
  version earlier than 7.4';
+ 
+ create or replace function @NAMESPACE at .make_function_strict (text, text) returns integer as
+ '
+ begin
+    update "pg_catalog"."pg_proc" set proisstrict = ''t'' where 
+      proname = $1 and pronamespace = (select oid from "pg_catalog"."pg_namespace" where nspname = ''_ at CLUSTERNAME@'') and prolang = (select oid from "pg_catalog"."pg_language" where lanname = ''c'');
+    return 1 ;
+ end
+ ' language plpgsql;
+ 
+ comment on function @NAMESPACE at .make_table_strict (text, text) is
+ 'Equivalent to 8.1+ ALTER FUNCTION ... STRICT';

Index: slony1_funcs.v74.sql
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.v74.sql,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** slony1_funcs.v74.sql	6 Jan 2006 17:07:46 -0000	1.6.2.3
--- slony1_funcs.v74.sql	8 Feb 2007 22:52:40 -0000	1.6.2.4
***************
*** 101,104 ****
  
  comment on function @NAMESPACE at .pre74() is 
! 'Returns 1/0 based on whether or not the DB is running a
! version earlier than 7.4';
--- 101,115 ----
  
  comment on function @NAMESPACE at .pre74() is 
! 'Returns 1/0 based on whether or not the DB is running a version earlier than 7.4';
! 
! create or replace function @NAMESPACE at .make_function_strict (text, text) returns void as
! '
! begin
!    update "pg_catalog"."pg_proc" set proisstrict = ''t'' where 
!      proname = $1 and pronamespace = (select oid from "pg_catalog"."pg_namespace" where nspname = ''_ at CLUSTERNAME@'') and prolang = (select oid from "pg_catalog"."pg_language" where lanname = ''c'');
!    return 1 ;
! end
! ' language plpgsql;
! 
! comment on function @NAMESPACE at .make_function_strict (text, text) is
! 'Equivalent to 8.1+ ALTER FUNCTION ... STRICT';