postgres.git / summary / log / commit / refs

commit    6bfa6b0867c370d72cbaeba18d6d3a5d80eae0e7
Author:   Simon Riggs <simon@2ndQuadrant.com>
Date:     Mon Jan 31 19:24:29 2011 +0000

    Fix error code for canceling statement due to conflict with recovery.
    All retryable conflict errors now have an error code that indicates that
    a retry is possible, correcting my incomplete fix of 2010/05/12
    
    Tatsuo Ishii and Simon Riggs, input from Robert Haas and Florian Pflug


 src/backend/storage/ipc/standby.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 2f9fe8ab8eb..8ddfa60b388 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -494,7 +494,7 @@ CheckRecoveryConflictDeadlock(LWLockId partitionLock)
 	 * process will continue to wait even though we have avoided deadlock.
 	 */
 	ereport(ERROR,
-			(errcode(ERRCODE_QUERY_CANCELED),
+			(errcode(ERRCODE_T_R_DEADLOCK_DETECTED),
 			 errmsg("canceling statement due to conflict with recovery"),
 	   errdetail("User transaction caused buffer deadlock with recovery.")));
 }


[parent: 1df57f63f3f6]