Change made to elog:

o  Change all current CVS messages of NOTICE to WARNING.  We were going
to do this just before 7.3 beta but it has to be done now, as you will
see below.

o Change current INFO messages that should be controlled by
client_min_messages to NOTICE.

o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc.
to always go to the client.

o Remove INFO from the client_min_messages options and add NOTICE.

Seems we do need three non-ERROR elog levels to handle the various
behaviors we need for these messages.

Regression passed.

8 files changed, 40 insertions, 40 deletions

diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 9f42f268825..b84fd4d7b75 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.121 2002/03/02 21:39:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.122 2002/03/06 06:10:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -425,7 +425,7 @@ BufferAlloc(Relation reln,
 
 			if (smok == FALSE)
 			{
-				elog(NOTICE, "BufferAlloc: cannot write block %u for %u/%u",
+				elog(WARNING, "BufferAlloc: cannot write block %u for %u/%u",
 					 buf->tag.blockNum,
 					 buf->tag.rnode.tblNode, buf->tag.rnode.relNode);
 				inProgress = FALSE;
@@ -974,7 +974,7 @@ BufferPoolCheckLeak(void)
 		{
 			BufferDesc *buf = &(BufferDescriptors[i]);
 
-			elog(NOTICE,
+			elog(WARNING,
 				 "Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, \
 rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %ld)",
 				 i, buf->freeNext, buf->freePrev,
@@ -1403,7 +1403,7 @@ PrintPinnedBufs()
 	for (i = 0; i < NBuffers; ++i, ++buf)
 	{
 		if (PrivateRefCount[i] > 0)
-			elog(NOTICE, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \
+			elog(WARNING, "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, \
 blockNum=%u, flags=0x%x, refcount=%d %ld)",
 				 i, buf->freeNext, buf->freePrev,
 				 buf->tag.rnode.tblNode, buf->tag.rnode.relNode,
@@ -1504,7 +1504,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock)
 									   (char *) MAKE_PTR(bufHdr->data));
 					if (status == SM_FAIL)
 					{
-						elog(NOTICE, "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it",
+						elog(WARNING, "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it",
 							 RelationGetRelationName(rel), firstDelBlock,
 							 bufHdr->tag.blockNum);
 						return (-1);
@@ -1514,7 +1514,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock)
 				}
 				if (LocalRefCount[i] > 0)
 				{
-					elog(NOTICE, "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)",
+					elog(WARNING, "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)",
 						 RelationGetRelationName(rel), firstDelBlock,
 						 bufHdr->tag.blockNum, LocalRefCount[i]);
 					return (-2);
@@ -1592,7 +1592,7 @@ FlushRelationBuffers(Relation rel, BlockNumber firstDelBlock)
 			if (!(bufHdr->flags & BM_FREE))
 			{
 				LWLockRelease(BufMgrLock);
-				elog(NOTICE, "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)",
+				elog(WARNING, "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)",
 					 RelationGetRelationName(rel), firstDelBlock,
 					 bufHdr->tag.blockNum,
 					 PrivateRefCount[i], bufHdr->refcount);
@@ -2198,7 +2198,7 @@ AbortBufferIO(void)
 			/* Issue notice if this is not the first failure... */
 			if (buf->flags & BM_IO_ERROR)
 			{
-				elog(NOTICE, "write error may be permanent: cannot write block %u for %u/%u",
+				elog(WARNING, "write error may be permanent: cannot write block %u for %u/%u",
 					 buf->tag.blockNum,
 					 buf->tag.rnode.tblNode, buf->tag.rnode.relNode);
 			}
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index cfa3a34b35f..8726a394599 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.89 2002/03/02 21:39:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.90 2002/03/06 06:10:03 momjian Exp $
  *
  * NOTES:
  *
@@ -1193,7 +1193,7 @@ FreeFile(FILE *file)
 		}
 	}
 	if (i < 0)
-		elog(NOTICE, "FreeFile: file was not obtained from AllocateFile");
+		elog(WARNING, "FreeFile: file was not obtained from AllocateFile");
 
 	fclose(file);
 }
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 6d6c001d073..ad351542347 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.76 2002/03/02 21:39:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.77 2002/03/06 06:10:05 momjian Exp $
  *
  * NOTES
  *
@@ -350,7 +350,7 @@ IpcSemaphoreKill(IpcSemaphoreId semId)
 				semId, strerror(errno));
 
 	/*
-	 * We used to report a failure via elog(NOTICE), but that's pretty
+	 * We used to report a failure via elog(WARNING), but that's pretty
 	 * pointless considering any client has long since disconnected ...
 	 */
 }
@@ -663,7 +663,7 @@ IpcMemoryDetach(int status, Datum shmaddr)
 				DatumGetPointer(shmaddr), strerror(errno));
 
 	/*
-	 * We used to report a failure via elog(NOTICE), but that's pretty
+	 * We used to report a failure via elog(WARNING), but that's pretty
 	 * pointless considering any client has long since disconnected ...
 	 */
 }
@@ -680,7 +680,7 @@ IpcMemoryDelete(int status, Datum shmId)
 				DatumGetInt32(shmId), IPC_RMID, strerror(errno));
 
 	/*
-	 * We used to report a failure via elog(NOTICE), but that's pretty
+	 * We used to report a failure via elog(WARNING), but that's pretty
 	 * pointless considering any client has long since disconnected ...
 	 */
 }
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 2b0eee5e4f2..f9056ae375b 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.63 2001/12/28 18:16:43 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.64 2002/03/06 06:10:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -156,7 +156,7 @@ ShmemAlloc(Size size)
 	SpinLockRelease(ShmemLock);
 
 	if (!newSpace)
-		elog(NOTICE, "ShmemAlloc: out of memory");
+		elog(WARNING, "ShmemAlloc: out of memory");
 
 	return newSpace;
 }
@@ -346,7 +346,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 		{
 			LWLockRelease(ShmemIndexLock);
 
-			elog(NOTICE, "ShmemInitStruct: ShmemIndex entry size is wrong");
+			elog(WARNING, "ShmemInitStruct: ShmemIndex entry size is wrong");
 			/* let caller print its message too */
 			return NULL;
 		}
@@ -363,7 +363,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 			hash_search(ShmemIndex, (void *) &item, HASH_REMOVE, NULL);
 			LWLockRelease(ShmemIndexLock);
 
-			elog(NOTICE, "ShmemInitStruct: cannot allocate '%s'",
+			elog(WARNING, "ShmemInitStruct: cannot allocate '%s'",
 				 name);
 			*foundPtr = FALSE;
 			return NULL;
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index d6f959f5ac3..17139238d85 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.19 2001/11/05 17:46:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.20 2002/03/06 06:10:06 momjian Exp $
  *
  * NOTES
  *
@@ -30,7 +30,7 @@
 /*#define SHMQUEUE_DEBUG*/
 #ifdef SHMQUEUE_DEBUG
 
-#define SHMQUEUE_DEBUG_ELOG NOTICE
+#define SHMQUEUE_DEBUG_ELOG WARNING
 
 static void dumpQ(SHM_QUEUE *q, char *s);
 #endif
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 228509fa0f7..88f30496543 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.105 2002/03/02 21:39:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.106 2002/03/06 06:10:06 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -248,7 +248,7 @@ LockMethodTableInit(char *tabName,
 
 	if (numModes >= MAX_LOCKMODES)
 	{
-		elog(NOTICE, "LockMethodTableInit: too many lock types %d greater than %d",
+		elog(WARNING, "LockMethodTableInit: too many lock types %d greater than %d",
 			 numModes, MAX_LOCKMODES);
 		return INVALID_LOCKMETHOD;
 	}
@@ -472,7 +472,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 	lockMethodTable = LockMethodTable[lockmethod];
 	if (!lockMethodTable)
 	{
-		elog(NOTICE, "LockAcquire: bad lock table %d", lockmethod);
+		elog(WARNING, "LockAcquire: bad lock table %d", lockmethod);
 		return FALSE;
 	}
 
@@ -662,7 +662,7 @@ LockAcquire(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 												(void *) holder,
 												HASH_REMOVE, NULL);
 				if (!holder)
-					elog(NOTICE, "LockAcquire: remove holder, table corrupted");
+					elog(WARNING, "LockAcquire: remove holder, table corrupted");
 			}
 			else
 				HOLDER_PRINT("LockAcquire: NHOLDING", holder);
@@ -1010,7 +1010,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 	lockMethodTable = LockMethodTable[lockmethod];
 	if (!lockMethodTable)
 	{
-		elog(NOTICE, "lockMethodTable is null in LockRelease");
+		elog(WARNING, "lockMethodTable is null in LockRelease");
 		return FALSE;
 	}
 
@@ -1032,7 +1032,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 	if (!lock)
 	{
 		LWLockRelease(masterLock);
-		elog(NOTICE, "LockRelease: no such lock");
+		elog(WARNING, "LockRelease: no such lock");
 		return FALSE;
 	}
 	LOCK_PRINT("LockRelease: found", lock, lockmode);
@@ -1055,10 +1055,10 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 		LWLockRelease(masterLock);
 #ifdef USER_LOCKS
 		if (lockmethod == USER_LOCKMETHOD)
-			elog(NOTICE, "LockRelease: no lock with this tag");
+			elog(WARNING, "LockRelease: no lock with this tag");
 		else
 #endif
-			elog(NOTICE, "LockRelease: holder table corrupted");
+			elog(WARNING, "LockRelease: holder table corrupted");
 		return FALSE;
 	}
 	HOLDER_PRINT("LockRelease: found", holder);
@@ -1072,7 +1072,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 		HOLDER_PRINT("LockRelease: WRONGTYPE", holder);
 		Assert(holder->holding[lockmode] >= 0);
 		LWLockRelease(masterLock);
-		elog(NOTICE, "LockRelease: you don't own a lock of type %s",
+		elog(WARNING, "LockRelease: you don't own a lock of type %s",
 			 lock_mode_names[lockmode]);
 		return FALSE;
 	}
@@ -1126,7 +1126,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 		if (!lock)
 		{
 			LWLockRelease(masterLock);
-			elog(NOTICE, "LockRelease: remove lock, table corrupted");
+			elog(WARNING, "LockRelease: remove lock, table corrupted");
 			return FALSE;
 		}
 		wakeupNeeded = false;	/* should be false, but make sure */
@@ -1155,7 +1155,7 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag,
 		if (!holder)
 		{
 			LWLockRelease(masterLock);
-			elog(NOTICE, "LockRelease: remove holder, table corrupted");
+			elog(WARNING, "LockRelease: remove holder, table corrupted");
 			return FALSE;
 		}
 	}
@@ -1204,7 +1204,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc,
 	lockMethodTable = LockMethodTable[lockmethod];
 	if (!lockMethodTable)
 	{
-		elog(NOTICE, "LockReleaseAll: bad lockmethod %d", lockmethod);
+		elog(WARNING, "LockReleaseAll: bad lockmethod %d", lockmethod);
 		return FALSE;
 	}
 
@@ -1308,7 +1308,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc,
 		if (!holder)
 		{
 			LWLockRelease(masterLock);
-			elog(NOTICE, "LockReleaseAll: holder table corrupted");
+			elog(WARNING, "LockReleaseAll: holder table corrupted");
 			return FALSE;
 		}
 
@@ -1326,7 +1326,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PROC *proc,
 			if (!lock)
 			{
 				LWLockRelease(masterLock);
-				elog(NOTICE, "LockReleaseAll: cannot remove lock from HTAB");
+				elog(WARNING, "LockReleaseAll: cannot remove lock from HTAB");
 				return FALSE;
 			}
 		}
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index d23d9359ca2..92e0257c2c6 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.43 2002/01/30 19:34:55 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.44 2002/03/06 06:10:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -107,7 +107,7 @@ PageAddItem(Page page,
 		{
 			if (offsetNumber > limit)
 			{
-				elog(NOTICE, "PageAddItem: tried overwrite after maxoff");
+				elog(WARNING, "PageAddItem: tried overwrite after maxoff");
 				return InvalidOffsetNumber;
 			}
 			if (offsetNumber < limit)
@@ -116,7 +116,7 @@ PageAddItem(Page page,
 				if (((*itemId).lp_flags & LP_USED) ||
 					((*itemId).lp_len != 0))
 				{
-					elog(NOTICE, "PageAddItem: tried overwrite of used ItemId");
+					elog(WARNING, "PageAddItem: tried overwrite of used ItemId");
 					return InvalidOffsetNumber;
 				}
 			}
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 0fc28cedf67..259ee424911 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.55 2002/03/02 21:39:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.56 2002/03/06 06:10:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -516,12 +516,12 @@ smgrDoPendingDeletes(bool isCommit)
 			/*
 			 * And delete the physical files.
 			 *
-			 * Note: we treat deletion failure as a NOTICE, not an error,
+			 * Note: we treat deletion failure as a WARNING, not an error,
 			 * because we've already decided to commit or abort the
 			 * current xact.
 			 */
 			if ((*(smgrsw[pending->which].smgr_unlink)) (pending->relnode) == SM_FAIL)
-				elog(NOTICE, "cannot unlink %u/%u: %m",
+				elog(WARNING, "cannot unlink %u/%u: %m",
 					 pending->relnode.tblNode, pending->relnode.relNode);
 		}
 		pfree(pending);