aboutsummaryrefslogtreecommitdiff
path: root/src/backend/access/transam/xlog.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/access/transam/xlog.c')
-rw-r--r--src/backend/access/transam/xlog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 572f892bd3d..add269577b6 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.88 2002/03/02 21:39:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.89 2002/03/06 06:09:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1284,7 +1284,7 @@ XLogFlush(XLogRecPtr record)
* CreateCheckpoint will try to flush it at the end of recovery.)
*
* The current approach is to ERROR under normal conditions, but only
- * NOTICE during recovery, so that the system can be brought up even if
+ * WARNING during recovery, so that the system can be brought up even if
* there's a corrupt LSN. Note that for calls from xact.c, the ERROR
* will be promoted to PANIC since xact.c calls this routine inside a
* critical section. However, calls from bufmgr.c are not within
@@ -1292,7 +1292,7 @@ XLogFlush(XLogRecPtr record)
* on a data page.
*/
if (XLByteLT(LogwrtResult.Flush, record))
- elog(InRecovery ? NOTICE : ERROR,
+ elog(InRecovery ? WARNING : ERROR,
"XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X",
record.xlogid, record.xrecoff,
LogwrtResult.Flush.xlogid, LogwrtResult.Flush.xrecoff);
@@ -1609,7 +1609,7 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr)
{
elog(LOG, "archiving transaction log file %s",
xlde->d_name);
- elog(NOTICE, "archiving log files is not implemented!");
+ elog(WARNING, "archiving log files is not implemented!");
}
else
{
@@ -2091,12 +2091,12 @@ WriteControlFile(void)
StrNCpy(ControlFile->lc_ctype, localeptr, LOCALE_NAME_BUFLEN);
/*
- * Issue warning notice if initdb'ing in a locale that will not permit
+ * Issue warning WARNING if initdb'ing in a locale that will not permit
* LIKE index optimization. This is not a clean place to do it, but I
* don't see a better place either...
*/
if (!locale_is_like_safe())
- elog(NOTICE, "Initializing database with %s collation order."
+ elog(WARNING, "Initializing database with %s collation order."
"\n\tThis locale setting will prevent use of index optimization for"
"\n\tLIKE and regexp searches. If you are concerned about speed of"
"\n\tsuch queries, you may wish to set LC_COLLATE to \"C\" and"