rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tom Lane 2006-01-08 21:24:37 +00:00
parent cbf39930d6
commit 2645cb54cb
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ltree/_ltree_gist.c
View File

@ -546,10 +546,6 @@ _ltree_consistent(PG_FUNCTION_ARGS)
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
bool res = false; bool res = false;
#ifndef assert_enabled
#define assert_enabled 0
#endif
switch (strategy) switch (strategy)
{ {
case 10: case 10:

4
contrib/ltree/ltree_gist.c
View File

@ -631,10 +631,6 @@ ltree_consistent(PG_FUNCTION_ARGS)
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
bool res = false; bool res = false;
#ifndef assert_enabled
#define assert_enabled 0
#endif
switch (strategy) switch (strategy)
{ {
case BTLessStrategyNumber: case BTLessStrategyNumber:

7
src/backend/port/ipc_test.c
View File

@ -21,7 +21,7 @@
* *
* *
* IDENTIFICATION * 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; volatile uint32 CritSectionCount = 0;
bool IsUnderPostmaster = false; bool IsUnderPostmaster = false;
bool assert_enabled = true;
int MaxBackends = 32; int MaxBackends = 32;
int NBuffers = 64; int NBuffers = 64;
char *DataDir = "."; char *DataDir = ".";
#ifndef assert_enabled
bool assert_enabled = true;
#endif
#define MAX_ON_EXITS 20 #define MAX_ON_EXITS 20

6
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * 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 * GUC option variables that are exported from this module
*/ */
#ifdef USE_ASSERT_CHECKING
bool assert_enabled = true; bool assert_enabled = true;
#else
bool assert_enabled = false;
#endif
bool log_duration = false; bool log_duration = false;
bool Debug_print_plan = false; bool Debug_print_plan = false;
bool Debug_print_parse = false; bool Debug_print_parse = false;

4
src/include/postgres.h
View File

@ -10,7 +10,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1995, Regents of the University of California * 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 * Trap
* Generates an exception if the given condition is true. * Generates an exception if the given condition is true.
*
*/ */
#define Trap(condition, errorType) \ #define Trap(condition, errorType) \
do { \ do { \
@ -510,7 +509,6 @@ extern DLLIMPORT bool assert_enabled;
#define AssertMacro(condition) ((void)true) #define AssertMacro(condition) ((void)true)
#define AssertArg(condition) #define AssertArg(condition)
#define AssertState(condition) #define AssertState(condition)
#define assert_enabled 0
#else #else
#define Assert(condition) \ #define Assert(condition) \
Trap(!(condition), "FailedAssertion") Trap(!(condition), "FailedAssertion")