*** ./src/backend/utils/misc/guc-file.l.orig	Sun Jun  4 09:00:16 2000
--- ./src/backend/utils/misc/guc-file.l	Thu Jul 27 13:55:20 2000
***************
*** 33,39 ****
  	GUC_REAL = 4,
  	GUC_EQUALS = 5,
  	GUC_EOL = 99,
! 	GUC_ERROR = 100,
  };
  
  #if defined(yywrap)
--- 33,39 ----
  	GUC_REAL = 4,
  	GUC_EQUALS = 5,
  	GUC_EOL = 99,
! 	GUC_ERROR = 100
  };
  
  #if defined(yywrap)
*** ./src/bin/pg_dump/pg_backup.h.orig	Sat Jul 22 09:00:19 2000
--- ./src/bin/pg_dump/pg_backup.h	Thu Jul 27 14:01:15 2000
***************
*** 115,122 ****
  /* Called to write *data* to the archive */
  extern int	WriteData(Archive* AH, const void* data, int dLen);
  
! //extern int 	StartBlobs(Archive* AH);
! //extern int	EndBlobs(Archive* AH);
  extern int	StartBlob(Archive* AH, int oid);
  extern int	EndBlob(Archive* AH, int oid);
  
--- 115,124 ----
  /* Called to write *data* to the archive */
  extern int	WriteData(Archive* AH, const void* data, int dLen);
  
! /* 
! extern int 	StartBlobs(Archive* AH);
! extern int	EndBlobs(Archive* AH);
! */
  extern int	StartBlob(Archive* AH, int oid);
  extern int	EndBlob(Archive* AH, int oid);
  
*** ./src/bin/pg_dump/pg_backup_archiver.c.orig	Mon Jul 24 09:00:17 2000
--- ./src/bin/pg_dump/pg_backup_archiver.c	Thu Jul 27 14:02:17 2000
***************
*** 1357,1363 ****
  		if (RestoringToDB(AH))
  		{
  			ReconnectDatabase(AH, te->owner);
! 			//todo pjw - ???? fix for db connection...
  		}
  		else
  		{
--- 1357,1363 ----
  		if (RestoringToDB(AH))
  		{
  			ReconnectDatabase(AH, te->owner);
! 			/* todo pjw - ???? fix for db connection... */
  		}
  		else
  		{
*** ./src/include/utils/guc.h.orig	Tue Jul  4 09:00:31 2000
--- ./src/include/utils/guc.h	Thu Jul 27 12:40:13 2000
***************
*** 43,49 ****
  	PGC_SIGHUP,
  	PGC_BACKEND,
  	PGC_SUSET,
! 	PGC_USERSET,
  } GucContext;
  
  
--- 43,49 ----
  	PGC_SIGHUP,
  	PGC_BACKEND,
  	PGC_SUSET,
! 	PGC_USERSET
  } GucContext;
  
  
No differences encountered