Chris Browne cbbrowne at lists.slony.info
Wed Sep 24 12:54:11 PDT 2008
Update of /home/cvsd/slony1/slony1-engine/src/backend
In directory main.slony.info:/tmp/cvs-serv28834/src/backend

Modified Files:
	slony1_funcs.c 
Log Message:
Resolution to bug #46 - incompatibility with PG 8.4.

- Set up autoconf to detect whether or not GetActiveSnapshot() is
  available, and set up #define if it is

- Then config.h.in needs the #define variable, and slony1_funcs.c
  refers to it to control whether it uses the old variable or the
  new function.


Index: slony1_funcs.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/backend/slony1_funcs.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** slony1_funcs.c	26 May 2008 21:09:48 -0000	1.67
--- slony1_funcs.c	24 Sep 2008 19:54:09 -0000	1.68
***************
*** 29,32 ****
--- 29,35 ----
  #include "utils/elog.h"
  #include "utils/guc.h"
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ #include "utils/snapmgr.h"
+ #endif
  #ifdef HAVE_TYPCACHE
  #include "utils/typcache.h"
***************
*** 135,140 ****
--- 138,148 ----
  	bool		isnull;
  
+ #ifdef HAVE_GETACTIVESNAPSHOT
+ 	if (GetActiveSnapshot() == NULL)
+ 		elog(ERROR, "Slony-I: ActiveSnapshot is NULL in createEvent()");
+ #else
  	if (SerializableSnapshot == NULL)
  		elog(ERROR, "Slony-I: SerializableSnapshot is NULL in createEvent()");
+ #endif
  
  	if ((rc = SPI_connect()) < 0)



More information about the Slony1-commit mailing list