Chris Browne cbbrowne at lists.slony.info
Mon Jul 20 15:30:13 PDT 2009
Update of /home/cvsd/slony1/slony1-engine/src/slon
In directory main.slony.info:/tmp/cvs-serv17489

Modified Files:
      Tag: REL_2_0_STABLE
	dbutils.c remote_worker.c 
Log Message:
Introduce "%L" which is interpreted as "%lld" - bug #92


Index: remote_worker.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.176.2.2
retrieving revision 1.176.2.3
diff -C2 -d -r1.176.2.2 -r1.176.2.3
*** remote_worker.c	20 Jul 2009 16:42:38 -0000	1.176.2.2
--- remote_worker.c	20 Jul 2009 22:30:10 -0000	1.176.2.3
***************
*** 5739,5743 ****
  							slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%lld' ", curr_max);
  						}
  						else
--- 5739,5743 ----
  							slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%L' ", curr_max);
  						}
  						else
***************
*** 5746,5750 ****
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%lld' and '%lld' ",
  											 curr_min, curr_max);
  						}
--- 5746,5750 ----
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%L' and '%L' ",
  											 curr_min, curr_max);
  						}
***************
*** 5774,5778 ****
  			slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%lld' ", curr_max);
  		}
  		else
--- 5774,5778 ----
  			slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%L' ", curr_max);
  		}
  		else
***************
*** 5781,5785 ****
  					 curr_min, curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq not between '%lld' and '%lld' ",
  							 curr_min, curr_max);
  		}
--- 5781,5785 ----
  					 curr_min, curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq not between '%L' and '%L' ",
  							 curr_min, curr_max);
  		}

Index: dbutils.c
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/src/slon/dbutils.c,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** dbutils.c	28 May 2008 19:46:46 -0000	1.30
--- dbutils.c	20 Jul 2009 22:30:10 -0000	1.30.2.1
***************
*** 495,498 ****
--- 495,504 ----
  						break;
  
+ 					case 'L':
+ 						sprintf(buf, "%lld", va_arg(ap, int));
+ 						dstring_append(dsp, buf);
+ 						fmt++;
+ 						break;
+ 
  					default:
  						dstring_addchar(dsp, '%');



More information about the Slony1-commit mailing list