diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-03-06 06:10:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-03-06 06:10:59 +0000 |
| commit | 92288a1cf9490be3835dc8524ee2ba407f1b885a (patch) | |
| tree | c4fe79ee2cb5cb8fa3385580c6cf431a97c2fc48 /src/bin/psql/common.c | |
| parent | 22ebad9e39e268c9d4c6c2e422af727058830089 (diff) | |
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.
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 43293a0cfbe..bd2c87fa7f6 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.39 2002/03/05 00:01:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.40 2002/03/06 06:10:31 momjian Exp $ */ #include "postgres_fe.h" @@ -147,7 +147,7 @@ psql_error(const char *fmt,...) /* - * for backend NOTICES + * for backend INFO, WARNING, ERROR */ void NoticeProcessor(void *arg, const char *message) @@ -574,14 +574,11 @@ SendQuery(const char *query) if (results) PQclear(results); - } + } /* Possible microtiming output */ - if (pset.timing && success) - { - ! printf(gettext("Total time: %.3fs\n"), ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000000.0); - } + printf(gettext("Total time: %.3fs\n"), ((after.tv_sec-before.tv_sec)*1000000 + after.tv_usec - before.tv_usec) / 1000000.0); return success; } |