summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2010-06-17 17:44:40 +0000
committerTom Lane2010-06-17 17:44:40 +0000
commit78e8f0025e3f18855dc0af5916223f9fcfda5706 (patch)
treeb1aa754d627ad63d32b3dd0ad39936a01e2af146
parent09698bb5fb20a069f84ddbfab0bff9ae0d0f7c8a (diff)
Clean up some randomness associated with trace_recovery_messages: don't
put the variable declaration in the middle of a bunch of externs, and do use extern where it should be used.
-rw-r--r--src/backend/utils/misc/guc.c5
-rw-r--r--src/include/miscadmin.h4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 2461966f0d..48280b460c 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <[email protected]>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.555 2010/06/15 07:52:10 itagaki Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.556 2010/06/17 17:44:40 tgl Exp $
*
*--------------------------------------------------------------------
*/
@@ -119,8 +119,6 @@ extern bool fullPageWrites;
extern int vacuum_defer_cleanup_age;
extern int ssl_renegotiation_limit;
-int trace_recovery_messages = LOG;
-
#ifdef TRACE_SORT
extern bool trace_sort;
#endif
@@ -375,6 +373,7 @@ int log_min_messages = WARNING;
int client_min_messages = NOTICE;
int log_min_duration_statement = -1;
int log_temp_files = -1;
+int trace_recovery_messages = LOG;
int num_temp_buffers = 1000;
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 5d17acd6cd..a65bcda504 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -13,7 +13,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.220 2010/02/26 02:01:20 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.221 2010/06/17 17:44:40 tgl Exp $
*
* NOTES
* some of the information in this file should be moved to other files.
@@ -242,7 +242,7 @@ extern void PreventCommandDuringRecovery(const char *cmdname);
/* in utils/misc/guc.c */
extern int trace_recovery_messages;
-int trace_recovery(int trace_level);
+extern int trace_recovery(int trace_level);
/*****************************************************************************
* pdir.h -- *