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

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index 8d827464d958df47ed91664aaf48602da1ac7454..a92ae4af590cdf06796c19553ac9d3ac0a8a6b27 100644 (file)
--- 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.")));
 }