diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/libpq/libpq.h | 20 | ||||
| -rw-r--r-- | src/include/miscadmin.h | 7 | ||||
| -rw-r--r-- | src/include/utils/elog.h | 34 |
3 files changed, 24 insertions, 37 deletions
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index a68d546d425..1b5de24dd79 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.49 2001/12/04 19:40:17 tgl Exp $ + * $Id: libpq.h,v 1.50 2002/03/04 01:46:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -38,17 +38,6 @@ typedef struct } PQArgBlock; /* - * PQerrormsg[] is used only for error messages generated within backend - * libpq, none of which are remarkably long. Note that this length should - * NOT be taken as any indication of the maximum error message length that - * the backend can create! elog() can in fact produce extremely long messages. - */ - -#define PQERRORMSG_LENGTH 1024 - -extern char PQerrormsg[PQERRORMSG_LENGTH]; /* in libpq/util.c */ - -/* * External functions. */ @@ -71,11 +60,4 @@ extern int pq_putmessage(char msgtype, const char *s, size_t len); extern void pq_startcopyout(void); extern void pq_endcopyout(bool errorAbort); -/* - * prototypes for functions in util.c - */ -extern void pqdebug(char *fmt, char *msg); -extern void PQtrace(void); -extern void PQuntrace(void); - #endif /* LIBPQ_H */ diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index 8872d54768e..4fb64473924 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: miscadmin.h,v 1.100 2002/03/02 21:39:34 momjian Exp $ + * $Id: miscadmin.h,v 1.101 2002/03/04 01:46:04 tgl Exp $ * * NOTES * some of the information in this file should be moved to @@ -104,6 +104,9 @@ extern void ProcessInterrupts(void); /* * from postmaster/postmaster.c */ +extern bool IsUnderPostmaster; +extern bool ClientAuthInProgress; + extern int PostmasterMain(int argc, char *argv[]); extern void ClosePostmasterPorts(bool pgstat_too); @@ -127,8 +130,6 @@ extern char pg_pathname[]; */ extern DLLIMPORT Oid MyDatabaseId; -extern bool IsUnderPostmaster; - /* Date/Time Configuration * * Constants to pass info from runtime environment: diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 9be3d2a19a5..0b72865e39d 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: elog.h,v 1.31 2002/03/02 21:39:35 momjian Exp $ + * $Id: elog.h,v 1.32 2002/03/04 01:46:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -15,25 +15,29 @@ #define ELOG_H /* Error level codes */ -#define DEBUG5 10 /* sent only to server logs, label DEBUG */ -#define DEBUG4 11 /* logs in decreasing detail */ +#define DEBUG5 10 /* Debugging messages, in categories + * of decreasing detail. */ +#define DEBUG4 11 #define DEBUG3 12 #define DEBUG2 13 #define DEBUG1 14 -#define LOG 15 /* sent only to server logs by default, - * label LOG. */ -#define INFO 16 /* sent only to client by default, for - * informative messages that are part of - * normal query operation. */ -#define NOTICE 17 /* sent to client and server by default, - * important messages, for unusual cases that +#define LOG 15 /* Server operational history messages; + * sent only to server log by default. */ +#define COMMERROR 16 /* Client communication problems; same as + * LOG for server reporting, but never ever + * try to send to client. */ +#define INFO 17 /* Informative messages that are part of + * normal query operation; sent only to + * client by default. */ +#define NOTICE 18 /* Important messages, for unusual cases that * should be reported but are not serious - * enough to abort the query. */ -#define ERROR 18 /* user error - return to known state */ -#define FATAL 19 /* fatal error - abort process */ -#define PANIC 20 /* take down the other backends with me */ + * enough to abort the query. Sent to client + * and server log by default. */ +#define ERROR 19 /* user error - return to known state */ +#define FATAL 20 /* fatal error - abort process */ +#define PANIC 21 /* take down the other backends with me */ -/*#define DEBUG DEBUG5*/ /* Backward compatibility with pre-7.3 */ +/*#define DEBUG DEBUG1*/ /* Backward compatibility with pre-7.3 */ /* Configurable parameters */ #ifdef ENABLE_SYSLOG |