Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/src/backend/tcop/postgres.c,v
retrieving revision 1.562
diff -c -r1.562 postgres.c
*** src/backend/tcop/postgres.c	13 Dec 2008 02:29:21 -0000	1.562
--- src/backend/tcop/postgres.c	16 Dec 2008 17:02:05 -0000
***************
*** 2569,2580 ****
  		QueryCancelPending = true;
  
  		/*
! 		 * If it's safe to interrupt, and we're waiting for a lock, service
! 		 * the interrupt immediately.  No point in interrupting if we're
! 		 * waiting for input, however.
  		 */
! 		if (ImmediateInterruptOK && InterruptHoldoffCount == 0 &&
! 			CritSectionCount == 0 && !DoingCommandRead)
  		{
  			/* bump holdoff count to make ProcessInterrupts() a no-op */
  			/* until we are done getting ready for it */
--- 2569,2580 ----
  		QueryCancelPending = true;
  
  		/*
! 		 * Service the interrupt immediately if we are waiting for input,
! 		 * or if it's safe to interrupt, and we're waiting for a lock.
  		 */
! 		if (DoingCommandRead || 
! 			(ImmediateInterruptOK && InterruptHoldoffCount == 0 &&
! 				CritSectionCount == 0))
  		{
  			/* bump holdoff count to make ProcessInterrupts() a no-op */
  			/* until we are done getting ready for it */
