Fix various places where global s/NOTICE/WARNING/ was applied with too

much enthusiasm.

3 files changed, 9 insertions, 11 deletions

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 48870b4bca1..dd78db51493 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.245 2002/12/15 16:17:44 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.246 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2294,7 +2294,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
 	 * status bits.  This is not really necessary, but will save time for
 	 * future transactions examining these tuples.
 	 *
-	 * XXX WARNING that this code fails to clear HEAP_MOVED_OFF tuples from
+	 * XXX NOTICE that this code fails to clear HEAP_MOVED_OFF tuples from
 	 * pages that were move source pages but not move dest pages.  One
 	 * also wonders whether it wouldn't be better to skip this step and
 	 * let the tuple status updates happen someplace that's not holding an
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 726ae556c42..eaa24c23fb4 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.22 2002/08/27 03:56:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.23 2003/01/07 22:23:17 tgl Exp $
  *
  * NOTES
  *
@@ -28,10 +28,8 @@
 #include "storage/shmem.h"
 
 /*#define SHMQUEUE_DEBUG*/
-#ifdef SHMQUEUE_DEBUG
-
-#define SHMQUEUE_DEBUG_ELOG WARNING
 
+#ifdef SHMQUEUE_DEBUG
 static void dumpQ(SHM_QUEUE *q, char *s);
 #endif
 
@@ -231,7 +229,7 @@ dumpQ(SHM_QUEUE *q, char *s)
 	}
 	snprintf(elem, sizeof(elem), "--->%lx", MAKE_OFFSET(q));
 	strcat(buf, elem);
-	elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf);
+	elog(DEBUG1, "%s: %s", s, buf);
 
 	snprintf(buf, sizeof(buf), "q nexts: %lx", MAKE_OFFSET(q));
 	count = 0;
@@ -251,7 +249,7 @@ dumpQ(SHM_QUEUE *q, char *s)
 	}
 	snprintf(elem, sizeof(elem), "--->%lx", MAKE_OFFSET(q));
 	strcat(buf, elem);
-	elog(SHMQUEUE_DEBUG_ELOG, "%s: %s", s, buf);
+	elog(DEBUG1, "%s: %s", s, buf);
 }
 
 #endif   /* SHMQUEUE_DEBUG */
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 94abd521b61..868db0907e7 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.105 2002/11/14 23:53:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.106 2003/01/07 22:23:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -747,8 +747,8 @@ send_message_to_frontend(int type, const char *msg)
 	AssertArg(type <= ERROR);
 
 	pq_beginmessage(&buf);
-	pq_sendbyte(&buf, type != ERROR ? 'N' : 'E');		/* N is INFO, NOTICE, or
-														 * WARNING */
+	/* 'N' (Notice) is for nonfatal conditions, 'E' is for errors */
+	pq_sendbyte(&buf, type < ERROR ? 'N' : 'E');
 	pq_sendstring(&buf, msg);
 	pq_endmessage(&buf);