diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-01-08 21:24:37 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-01-08 21:24:37 +0000 |
| commit | 2645cb54cb2661bc44e57e93614012274af44937 (patch) | |
| tree | f631a20d269b230f82804f7478f7498d5481e6d2 /src/backend | |
| parent | cbf39930d6b6d9d4bbc61c15ba2a4dd1057e0b6b (diff) | |
| download | postgresql-2645cb54cb2661bc44e57e93614012274af44937.tar.gz postgresql-2645cb54cb2661bc44e57e93614012274af44937.zip | |
Fix the assert_enabled issue properly. This eliminates the former ABI
difference between USE_ASSERT_CHECKING and not: the assert_enabled
variable is always there.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/port/ipc_test.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 6 |
2 files changed, 7 insertions, 6 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; |