diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2011-01-31 19:24:29 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2011-01-31 19:24:29 +0000 |
| commit | 6bfa6b0867c370d72cbaeba18d6d3a5d80eae0e7 (patch) | |
| tree | ee647b604399aa4427cba689e51a897b44301f66 /src | |
| parent | 1df57f63f3f60c684aa8918910ac410e9c780713 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/ipc/standby.c | 2 |
1 files changed, 1 insertions, 1 deletions
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."))); } |