postgresql/src
Tom Lane 1318f1ad77 Move CheckRecoveryConflictDeadlock() call to a safer place.
This kluge was inserted in a spot apparently chosen at random: the lock
manager's state is not yet fully set up for the wait, and in particular
LockWaitCancel hasn't been armed by setting lockAwaited, so the ProcLock
will not get cleaned up if the ereport is thrown.  This seems to not cause
any observable problem in trivial test cases, because LockReleaseAll will
silently clean up the debris; but I was able to cause failures with tests
involving subtransactions.

Fixes breakage induced by commit c85c941470.
Back-patch to all affected branches.
2011-08-02 15:16:37 -04:00
..
backend Move CheckRecoveryConflictDeadlock() call to a safer place. 2011-08-02 15:16:37 -04:00
bin Fix pg_restore's direct-to-database mode for standard_conforming_strings. 2011-07-28 14:07:04 -04:00
include Move CheckRecoveryConflictDeadlock() call to a safer place. 2011-08-02 15:16:37 -04:00
interfaces Fix previous patch so it also works if not USE_SSL (mea culpa). 2011-07-24 23:29:10 -04:00
makefiles Use single quotes in preference to double quotes for protecting pathnames. 2011-06-15 21:45:50 -04:00
pl Replace errdetail("%s", ...) with errdetail_internal("%s", ...). 2011-07-16 14:22:35 -04:00
port Unify spelling of "canceled", "canceling", "cancellation" 2011-07-02 23:30:01 +03:00
template Remove cvs keywords from all files. 2010-09-20 22:08:53 +02:00
test Unbreak unlogged tables. 2011-07-22 16:17:34 -04:00
timezone Pgindent run before 9.1 beta2. 2011-06-09 14:32:50 -04:00
tools Back-patch Fix bat file quoting of %ENV from commit 19b7fac8. 2011-07-04 10:44:07 -04:00
tutorial Stamp copyrights for year 2011. 2011-01-01 13:18:15 -05:00
.gitignore Convert cvsignore to gitignore, and add .gitignore for build targets. 2010-09-22 12:57:04 +02:00
bcc32.mak Remove useless whitespace at end of lines 2010-11-23 22:34:55 +02:00
DEVELOPERS Replace a couple of references to files that no longer exist in the source 2009-05-04 08:08:47 +00:00
Makefile Fix some oversights in distprep and maintainer-clean targets. 2011-03-10 00:04:05 -05:00
Makefile.global.in Make distprep and *clean build targets recurse into all subdirectories. 2011-07-03 13:55:27 -04:00
Makefile.shlib Use single quotes in preference to double quotes for protecting pathnames. 2011-06-15 21:45:50 -04:00
nls-global.mk Fix makefile logic to not break the build when xgettext is missing 2010-10-14 23:16:46 +03:00
win32.mak Remove useless whitespace at end of lines 2010-11-23 22:34:55 +02:00