diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2011-01-31 19:20:23 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2011-01-31 19:20:23 +0000 |
| commit | 8585ad36254199ca63700707ee78890da1755e4d (patch) | |
| tree | 2aceae4690d34c9f709a045e5c6aa559f5c017a0 /src | |
| parent | 51be78b09a83b8d533e4a9f81cf9a7f2edde6654 (diff) | |
| download | postgresql-8585ad36254199ca63700707ee78890da1755e4d.tar.gz postgresql-8585ad36254199ca63700707ee78890da1755e4d.zip | |
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 8d827464d95..a92ae4af590 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."))); } |