diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/port/ipc_test.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 6 | ||||
| -rw-r--r-- | src/include/postgres.h | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c index 89ebe1ded73..25fae2a9b92 100644 --- a/src/backend/port/ipc_test.c +++ b/src/backend/port/ipc_test.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.18 2005/10/15 02:49:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.19 2006/01/08 21:24:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -47,16 +47,13 @@ volatile uint32 InterruptHoldoffCount = 0; volatile uint32 CritSectionCount = 0; bool IsUnderPostmaster = false; +bool assert_enabled = true; int MaxBackends = 32; int NBuffers = 64; char *DataDir = "."; -#ifndef assert_enabled -bool assert_enabled = true; -#endif - #define MAX_ON_EXITS 20 diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 9c8fce2aba5..b466e135b69 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.307 2006/01/08 20:13:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.308 2006/01/08 21:24:36 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -147,7 +147,11 @@ static const char *show_tcp_keepalives_count(void); /* * GUC option variables that are exported from this module */ +#ifdef USE_ASSERT_CHECKING bool assert_enabled = true; +#else +bool assert_enabled = false; +#endif bool log_duration = false; bool Debug_print_plan = false; bool Debug_print_parse = false; diff --git a/src/include/postgres.h b/src/include/postgres.h index b82cd2fa8b5..8d1a38941b8 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.71 2005/04/14 01:38:21 tgl Exp $ + * $PostgreSQL: pgsql/src/include/postgres.h,v 1.72 2006/01/08 21:24:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -484,7 +484,6 @@ extern DLLIMPORT bool assert_enabled; /* * Trap * Generates an exception if the given condition is true. - * */ #define Trap(condition, errorType) \ do { \ @@ -510,7 +509,6 @@ extern DLLIMPORT bool assert_enabled; #define AssertMacro(condition) ((void)true) #define AssertArg(condition) #define AssertState(condition) -#define assert_enabled 0 #else #define Assert(condition) \ Trap(!(condition), "FailedAssertion") |