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

Modified Files:
      Tag: REL_1_2_STABLE
	slony1_funcs.c 
Log Message:
Changes to make 1.2 compile (and work) with PostgreSQL 8.4.

8.4 also breaks the ducttape tests, which use pgbench as a test
application. 8.4's pgbench prefixes all tables with pgbench_.
For now we can use 8.3's pgbench.


Jan


Index: slony1_funcs.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.53.2.3
retrieving revision 1.53.2.4
diff -C2 -d -r1.53.2.3 -r1.53.2.4
*** slony1_funcs.c	22 Nov 2007 22:51:04 -0000	1.53.2.3
--- slony1_funcs.c	23 Jul 2009 18:30:04 -0000	1.53.2.4
***************
*** 22,25 ****
--- 22,26 ----
  #include "commands/async.h"
  #include "catalog/pg_operator.h"
+ #include "catalog/pg_type.h"
  #include "access/xact.h"
  #include "access/transam.h"
***************
*** 27,30 ****
--- 28,34 ----
  #include "utils/elog.h"
  #include "utils/guc.h"
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ #include "utils/snapmgr.h"
+ #endif
  #ifdef HAVE_TYPCACHE
  #include "utils/typcache.h"
***************
*** 148,151 ****
--- 152,158 ----
  	int64		retval;
  	bool		isnull;
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ 	Snapshot	SerializableSnapshot = GetActiveSnapshot();
+ #endif
  
  	if (SerializableSnapshot == NULL)