diff options
| author | Hiroshi Inoue <inoue@tpf.co.jp> | 2000-02-22 09:55:26 +0000 |
|---|---|---|
| committer | Hiroshi Inoue <inoue@tpf.co.jp> | 2000-02-22 09:55:26 +0000 |
| commit | 5525297465185198d7a5db9273d5fab9e8a3faf1 (patch) | |
| tree | 3935c7620c0b6b9d5146c528ad4a36130181812c /src/backend/tcop/postgres.c | |
| parent | 167dce89123a60a9a12a002148ba8c2ffd45d3da (diff) | |
| download | postgresql-5525297465185198d7a5db9273d5fab9e8a3faf1.tar.gz postgresql-5525297465185198d7a5db9273d5fab9e8a3faf1.zip | |
Change cancel while waiting-for-lock stuff.
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 71087295313..0ad38686070 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.145 2000/02/21 02:42:35 inoue Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.146 2000/02/22 09:55:18 inoue Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -809,22 +809,12 @@ FloatExceptionHandler(SIGNAL_ARGS) " or was a divide by zero"); } - -static bool lockWaiting = false; -void SetLockWaiting(bool waiting) -{ - lockWaiting = waiting; -} /* signal handler for query cancel signal from postmaster */ static void QueryCancelHandler(SIGNAL_ARGS) { QueryCancel = true; - if (lockWaiting) - { - lockWaiting = false; - elog(ERROR, "Query Cancel requested while waiting lock"); - } + LockWaitCancel(); } void @@ -1513,7 +1503,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.145 $ $Date: 2000/02/21 02:42:35 $\n"); + puts("$Revision: 1.146 $ $Date: 2000/02/22 09:55:18 $\n"); } /* @@ -1573,6 +1563,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) * ---------------- */ QueryCancel = false; /* forget any earlier CANCEL signal */ + SetWaitingForLock(false); EnableNotifyInterrupt(); @@ -1583,7 +1574,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) firstchar = ReadCommand(parser_input); QueryCancel = false; /* forget any earlier CANCEL signal */ - lockWaiting = false; /* ---------------- * (4) disable async.c's signal handler. |