diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-07 04:30:41 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-01-07 04:30:41 +0000 |
| commit | 542b7c644534ee3e555573de77cde8a79a9e9a0e (patch) | |
| tree | d441675a7fc3c3bf2c1c1f98b5570e677b92aa2a /src | |
| parent | cb7ce7d0e30d208e612da634936dec0b53f78324 (diff) | |
| download | postgresql-542b7c644534ee3e555573de77cde8a79a9e9a0e.tar.gz postgresql-542b7c644534ee3e555573de77cde8a79a9e9a0e.zip | |
Clear QueryCancel and ProcDiePending at start of proc_exit, to ensure
that leftover cancel/die requests cannot interfere with exit activities.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/ipc/ipc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index b111e65cb06..d592a179867 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.58 2000/12/30 01:20:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.59 2001/01/07 04:30:41 tgl Exp $ * * NOTES * @@ -126,6 +126,14 @@ proc_exit(int code) */ proc_exit_inprogress = true; + /* + * Forget any pending cancel or die requests; we're doing our best + * to close up shop already. Note that the signal handlers will not + * set these flags again, now that proc_exit_inprogress is set. + */ + QueryCancel = false; + ProcDiePending = false; + if (DebugLvl > 1) elog(DEBUG, "proc_exit(%d)", code); |