Commit2645cb5

committed

Fix the assert_enabled issue properly. This eliminates the former ABI

difference between USE_ASSERT_CHECKING and not: the assert_enabledvariable is always there.

1 parentcbf3993 commit2645cb5Copy full SHA for 2645cb5

File tree

-17

lines changed

-17

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -546,10 +546,6 @@ _ltree_consistent(PG_FUNCTION_ARGS)`
`546`	`546`	`StrategyNumberstrategy= (StrategyNumber)PG_GETARG_UINT16(2);`
`547`	`547`	`boolres= false;`
`548`	`548`
`549`		`-#ifndefassert_enabled`
`550`		`-#defineassert_enabled 0`
`551`		`-#endif`
`552`		`-`
`553`	`549`	`switch (strategy)`
`554`	`550`	`{`
`555`	`551`	`case10:`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -631,10 +631,6 @@ ltree_consistent(PG_FUNCTION_ARGS)`
`631`	`631`	`StrategyNumberstrategy= (StrategyNumber)PG_GETARG_UINT16(2);`
`632`	`632`	`boolres= false;`
`633`	`633`
`634`		`-#ifndefassert_enabled`
`635`		`-#defineassert_enabled 0`
`636`		`-#endif`
`637`		`-`
`638`	`634`	`switch (strategy)`
`639`	`635`	`{`
`640`	`636`	`caseBTLessStrategyNumber:`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*`
`22`	`22`	`*`
`23`	`23`	`* IDENTIFICATION`
`24`		`- * $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.18 2005/10/15 02:49:22 momjian Exp $`
	`24`	`+ * $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.19 2006/01/08 21:24:36 tgl Exp $`
`25`	`25`	`*`
`26`	`26`	`*-------------------------------------------------------------------------`
`27`	`27`	`*/`
`@@ -47,16 +47,13 @@ volatile uint32 InterruptHoldoffCount = 0;`
`47`	`47`	`volatileuint32CritSectionCount=0;`
`48`	`48`
`49`	`49`	`boolIsUnderPostmaster= false;`
	`50`	`+boolassert_enabled= true;`
`50`	`51`
`51`	`52`	`intMaxBackends=32;`
`52`	`53`	`intNBuffers=64;`
`53`	`54`
`54`	`55`	`char*DataDir=".";`
`55`	`56`
`56`		`-#ifndefassert_enabled`
`57`		`-boolassert_enabled= true;`
`58`		`-#endif`
`59`		`-`
`60`	`57`
`61`	`58`	`#defineMAX_ON_EXITS 20`
`62`	`59`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.307 2006/01/0820:13:33 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.308 2006/01/0821:24:36 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -147,7 +147,11 @@ static const char *show_tcp_keepalives_count(void);`
`147`	`147`	`/*`
`148`	`148`	`* GUC option variables that are exported from this module`
`149`	`149`	`*/`
	`150`	`+#ifdefUSE_ASSERT_CHECKING`
`150`	`151`	`boolassert_enabled= true;`
	`152`	`+#else`
	`153`	`+boolassert_enabled= false;`
	`154`	`+#endif`
`151`	`155`	`boollog_duration= false;`
`152`	`156`	`boolDebug_print_plan= false;`
`153`	`157`	`boolDebug_print_parse= false;`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`11`	`11`	`* Portions Copyright (c) 1995, Regents of the University of California`
`12`	`12`	`*`
`13`		`- * $PostgreSQL: pgsql/src/include/postgres.h,v 1.71 2005/04/14 01:38:21 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/include/postgres.h,v 1.72 2006/01/08 21:24:37 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -484,7 +484,6 @@ extern DLLIMPORT bool assert_enabled;`
`484`	`484`	`/*`
`485`	`485`	`* Trap`
`486`	`486`	`*Generates an exception if the given condition is true.`
`487`		`- *`
`488`	`487`	`*/`
`489`	`488`	`#defineTrap(condition,errorType) \`
`490`	`489`	`do { \`
`@@ -510,7 +509,6 @@ extern DLLIMPORT bool assert_enabled;`
`510`	`509`	`#defineAssertMacro(condition)((void)true)`
`511`	`510`	`#defineAssertArg(condition)`
`512`	`511`	`#defineAssertState(condition)`
`513`		`-#defineassert_enabled 0`
`514`	`512`	`#else`
`515`	`513`	`#defineAssert(condition) \`
`516`	`514`	`Trap(!(condition), "FailedAssertion")`

Comments

(0)