Chris Browne cbbrowne at lists.slony.info
Wed Feb 13 15:02:42 PST 2008
Update of /home/cvsd/slony1/slony1-engine/src/slonik
In directory main.slony.info:/tmp/cvs-serv26228/slonik

Modified Files:
	slonik.c 
Log Message:
Replace some lingering references to old xxid functions to use the new
8.3 built-ins.


Index: slonik.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** slonik.c	21 Jan 2008 18:54:11 -0000	1.85
--- slonik.c	13 Feb 2008 23:02:40 -0000	1.86
***************
*** 3507,3515 ****
  	dstring_init(&query);
  	slon_mkquery(&query,
! 				 "select \"_%s\".lockSet(%d); "
! 				 "select \"_%s\".getMaxXid(); ",
! 				 stmt->hdr.script->clustername,
! 				 stmt->set_id,
! 				 stmt->hdr.script->clustername);
  	res1 = db_exec_select((SlonikStmt *) stmt, adminfo1, &query);
  	if (res1 == NULL)
--- 3507,3514 ----
  	dstring_init(&query);
  	slon_mkquery(&query,
! 		     "select \"_%s\".lockSet(%d); "
! 		     "select pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot());",
! 		     stmt->hdr.script->clustername,
! 		     stmt->set_id);
  	res1 = db_exec_select((SlonikStmt *) stmt, adminfo1, &query);
  	if (res1 == NULL)
***************
*** 3531,3536 ****
  
  	slon_mkquery(&query,
! 				 "select \"_%s\".getMinXid() >= '%s'; ",
! 				 stmt->hdr.script->clustername, maxxid_lock);
  
  	while (true)
--- 3530,3535 ----
  
  	slon_mkquery(&query,
! 		     "select pg_catalog.txid_snapshot_xmin(pg_catalog.txid_current_snapshot()) >= '%s'; ",
! 		     maxxid_lock);
  
  	while (true)



More information about the Slony1-commit mailing list