diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-08-10 20:29:18 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-08-10 20:29:18 +0000 |
| commit | c5354dff2052e6922ae7add998753d9bafcd19b0 (patch) | |
| tree | 59fea2bf500334eeb549109193b20ffbe2580430 /src/backend/tcop/postgres.c | |
| parent | 8be9bd83acd43762cf0dc8a45229a693896e7755 (diff) | |
| download | postgresql-c5354dff2052e6922ae7add998753d9bafcd19b0.tar.gz postgresql-c5354dff2052e6922ae7add998753d9bafcd19b0.zip | |
This patch removes a lot of unused code related to assertions and
error handling, and simplifies the code that remains. Apparently,
the code that left Berkeley had a whole "error handling subsystem",
which exceptions and whatnot. Since we don't use that anymore,
there's no reason to keep it around.
The regression tests pass with the patch applied. Unless anyone
sees a problem, please apply.
Neil Conway
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index e430d07c763..6c5e17b48f6 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.280 2002/08/06 05:24:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.281 2002/08/10 20:29:18 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -54,7 +54,6 @@ #include "tcop/pquery.h" #include "tcop/tcopprot.h" #include "tcop/utility.h" -#include "utils/exc.h" #include "utils/guc.h" #include "utils/memutils.h" #include "utils/ps_status.h" @@ -1148,7 +1147,6 @@ PostgresMain(int argc, char *argv[], const char *username) */ if (!IsUnderPostmaster) { - EnableExceptionHandling(true); MemoryContextInit(); } @@ -1676,7 +1674,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.280 $ $Date: 2002/08/06 05:24:04 $\n"); + puts("$Revision: 1.281 $ $Date: 2002/08/10 20:29:18 $\n"); } /* @@ -2074,35 +2072,6 @@ ShowUsage(const char *title) pfree(str.data); } -#ifdef NOT_USED -static int -assertEnable(int val) -{ - assert_enabled = val; - return val; -} - -#ifdef ASSERT_CHECKING_TEST -int -assertTest(int val) -{ - Assert(val == 0); - - if (assert_enabled) - { - /* val != 0 should be trapped by previous Assert */ - elog(DEBUG3, "Assert test successful (val = %d)", val); - } - else - elog(DEBUG3, "Assert checking is disabled (val = %d)", val); - - return val; -} -#endif - -#endif - - /* ---------------------------------------------------------------- * CreateCommandTag * |