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

Modified Files:
      Tag: REL_1_2_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.124.2.36
retrieving revision 1.124.2.37
diff -C2 -d -r1.124.2.36 -r1.124.2.37
*** remote_worker.c	20 Jul 2009 16:43:13 -0000	1.124.2.36
--- remote_worker.c	20 Jul 2009 22:30:47 -0000	1.124.2.37
***************
*** 6075,6079 ****
  							slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%lld' ", curr_max);
  						}
  						else
--- 6075,6079 ----
  							slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  							slon_appendquery(action_subquery,
! 										" log_actionseq <> '%L' ", curr_max);
  						}
  						else
***************
*** 6082,6086 ****
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%lld' and '%lld' ",
  											 curr_min, curr_max);
  						}
--- 6082,6086 ----
  									 curr_min, curr_max);
  							slon_appendquery(action_subquery,
! 								 " log_actionseq not between '%L' and '%L' ",
  											 curr_min, curr_max);
  						}
***************
*** 6110,6114 ****
  			slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%lld' ", curr_max);
  		}
  		else
--- 6110,6114 ----
  			slon_log(SLON_DEBUG4, "simple entry - %lld\n", curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq <> '%L' ", curr_max);
  		}
  		else
***************
*** 6117,6121 ****
  					 curr_min, curr_max);
  			slon_appendquery(action_subquery,
! 							 " log_actionseq not between '%lld' and '%lld' ",
  							 curr_min, curr_max);
  		}
--- 6117,6121 ----
  					 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.23.2.4
retrieving revision 1.23.2.5
diff -C2 -d -r1.23.2.4 -r1.23.2.5
*** dbutils.c	6 Dec 2006 09:46:09 -0000	1.23.2.4
--- dbutils.c	20 Jul 2009 22:30:47 -0000	1.23.2.5
***************
*** 480,483 ****
--- 480,489 ----
  						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