mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent drop database failure from showing.

Browse Source
This commit is contained in:
Bruce Momjian 2000-04-12 05:24:51 +00:00
parent 37e7c7dfcb
commit 8758985c3a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/include/c.h
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: c.h,v 1.66 2000/03/20 04:02:46 momjian Exp $ * $Id: c.h,v 1.67 2000/04/12 05:24:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -531,9 +531,11 @@ typedef struct Exception
* *
*/ */
#define Trap(condition, exception) \ #define Trap(condition, exception) \
{ if ((assert_enabled) && (condition)) \ do { \
if ((assert_enabled) && (condition)) \
ExceptionalCondition(CppAsString(condition), &(exception), \ ExceptionalCondition(CppAsString(condition), &(exception), \
(char*)NULL, __FILE__, __LINE__); } (char*)NULL, __FILE__, __LINE__); \
} while (0)
/* /*
* TrapMacro is the same as Trap but it's intended for use in macros: * TrapMacro is the same as Trap but it's intended for use in macros:
@ -577,9 +579,11 @@ extern int assert_enabled;
* *
*/ */
#define LogTrap(condition, exception, printArgs) \ #define LogTrap(condition, exception, printArgs) \
{ if ((assert_enabled) && (condition)) \ do { \
if ((assert_enabled) && (condition)) \
ExceptionalCondition(CppAsString(condition), &(exception), \ ExceptionalCondition(CppAsString(condition), &(exception), \
vararg_format printArgs, __FILE__, __LINE__); } vararg_format printArgs, __FILE__, __LINE__); \
} while (0)
/* /*
* LogTrapMacro is the same as LogTrap but it's intended for use in macros: * LogTrapMacro is the same as LogTrap but it's intended for use in macros:

2
src/test/regress/checkresults
View File

@ -4,7 +4,7 @@
[ "$#" -eq 0 ] && set regress.out [ "$#" -eq 0 ] && set regress.out
for file in `cat "$@" | grep 'failed$' | cut -d " " -f 1` for file in `cat "$@" | grep 'failed$' | grep -v '^dropdb: ' | cut -d " " -f 1`
do do
echo "====== $file ======" echo "====== $file ======"
diff -w expected/$file.out results diff -w expected/$file.out results