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

Modified Files:
	slonik.c slonik.h 
Log Message:
Autovacuum changes recently made to 2.0 branch
test tool changes recently made to 2.0 branch


Index: slonik.h
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** slonik.h	14 Feb 2008 22:21:42 -0000	1.34
--- slonik.h	21 Jul 2009 21:18:43 -0000	1.35
***************
*** 352,355 ****
--- 352,356 ----
  	int			sub_receiver;
  	int			sub_forward;
+ 	int			omit_copy;
  };
  

Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** slonik.c	11 Jun 2009 19:03:45 -0000	1.92
--- slonik.c	21 Jul 2009 21:18:43 -0000	1.93
***************
*** 1800,1809 ****
  		use_minor = 3;
  	}
! 	else	/* above 8.3 ??? */
  	{
  		use_major = 8;
! 		use_minor = 3;
  		printf("%s:%d: Possible unsupported PostgreSQL "
! 			"version (%d) %d.%d, defaulting to 8.3 support\n",
                          stmt->stmt_filename, stmt->stmt_lno, adminfo->pg_version,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
--- 1800,1814 ----
  		use_minor = 3;
  	}
! 	else if ((adminfo->pg_version >= 80400) && (adminfo->pg_version < 80500)) /* 8.4 */
  	{
  		use_major = 8;
! 		use_minor = 4;   /* at this point, there's nothing specifically different in 8.4 from 8.3 */
! 	}
! 	else	/* above 8.4 ??? */
! 	{
! 		use_major = 8;
! 		use_minor = 4;
  		printf("%s:%d: Possible unsupported PostgreSQL "
! 			"version (%d) %d.%d, defaulting to 8.4 support\n",
                          stmt->stmt_filename, stmt->stmt_lno, adminfo->pg_version,
  			(adminfo->pg_version/10000), ((adminfo->pg_version%10000)/100));
***************
*** 3426,3434 ****
  
  	slon_mkquery(&query,
! 				 "select \"_%s\".subscribeSet(%d, %d, %d, '%s'); ",
  				 stmt->hdr.script->clustername,
  				 stmt->sub_setid, stmt->sub_provider,
  				 stmt->sub_receiver,
! 				 (stmt->sub_forward) ? "t" : "f");
  	if (db_exec_evcommand((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{
--- 3431,3440 ----
  
  	slon_mkquery(&query,
! 				 "select \"_%s\".subscribeSet(%d, %d, %d, '%s', '%s'); ",
  				 stmt->hdr.script->clustername,
  				 stmt->sub_setid, stmt->sub_provider,
  				 stmt->sub_receiver,
! 				 (stmt->sub_forward) ? "t" : "f",
! 				 (stmt->omit_copy) ? "t" : "f");
  	if (db_exec_evcommand((SlonikStmt *) stmt, adminfo1, &query) < 0)
  	{