diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/miscadmin.h | 4 | ||||
| -rw-r--r-- | src/include/tcop/tcopprot.h | 9 | ||||
| -rw-r--r-- | src/include/utils/guc.h | 11 |
3 files changed, 9 insertions, 15 deletions
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index ec3ea9334d2..83e36ba24e8 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.172 2004/10/22 22:33:58 tgl Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.173 2004/11/14 19:35:34 tgl Exp $ * * NOTES * some of the information in this file should be moved to other files. @@ -302,7 +302,7 @@ extern ProcessingMode Mode; *****************************************************************************/ /* in utils/init/postinit.c */ -extern void InitPostgres(const char *dbname, const char *username); +extern bool InitPostgres(const char *dbname, const char *username); extern void BaseInit(void); /* in utils/init/miscinit.c */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index b70cc6a0737..1c7825ff460 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.71 2004/08/29 05:06:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.72 2004/11/14 19:35:35 tgl Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -33,11 +33,10 @@ extern int max_stack_depth; typedef enum { - /* Reverse order so GUC USERLIMIT is easier */ - LOGSTMT_ALL, /* log all statements */ + LOGSTMT_NONE, /* log no statements */ LOGSTMT_DDL, /* log data definition statements */ LOGSTMT_MOD, /* log modification statements, plus DDL */ - LOGSTMT_NONE /* log no statements */ + LOGSTMT_ALL /* log all statements */ } LogStmtLevel; extern LogStmtLevel log_statement; @@ -63,5 +62,7 @@ extern void authdie(SIGNAL_ARGS); extern int PostgresMain(int argc, char *argv[], const char *username); extern void ResetUsage(void); extern void ShowUsage(const char *title); +extern void set_debug_options(int debug_flag, + GucContext context, GucSource source); #endif /* TCOPPROT_H */ diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 19ae296559d..f5f4a78fe4d 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2004, PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.55 2004/11/05 19:16:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.56 2004/11/14 19:35:35 tgl Exp $ *-------------------------------------------------------------------- */ #ifndef GUC_H @@ -48,9 +48,6 @@ * be set in the connection startup packet, because when it is processed * we don't yet know if the user is a superuser. * - * USERLIMIT options can only be manipulated in certain ways by - * non-superusers. - * * USERSET options can be set by anyone any time. */ typedef enum @@ -60,7 +57,6 @@ typedef enum PGC_SIGHUP, PGC_BACKEND, PGC_SUSET, - PGC_USERLIMIT, PGC_USERSET } GucContext; @@ -74,9 +70,7 @@ typedef enum * as the current value. Note that source == PGC_S_OVERRIDE should be * used when setting a PGC_INTERNAL option. * - * PGC_S_UNPRIVILEGED isn't actually a source value, but the dividing line - * between privileged and unprivileged sources for USERLIMIT purposes. - * Similarly, PGC_S_INTERACTIVE isn't a real source value, but is the + * PGC_S_INTERACTIVE isn't actually a source value, but is the * dividing line between "interactive" and "non-interactive" sources for * error reporting purposes. * @@ -92,7 +86,6 @@ typedef enum PGC_S_ENV_VAR, /* postmaster environment variable */ PGC_S_FILE, /* postgresql.conf */ PGC_S_ARGV, /* postmaster command line */ - PGC_S_UNPRIVILEGED, /* dividing line for USERLIMIT */ PGC_S_DATABASE, /* per-database setting */ PGC_S_USER, /* per-user setting */ PGC_S_CLIENT, /* from client connection request */ |