From: Simon Riggs <simon@2ndQuadrant.com>
Date: Fri, 28 Jun 2013 23:57:25 +0000 (+0100)
Subject: Change errcode for lock_timeout to match NOWAIT
X-Git-Tag: REL9_4_BETA1~1408
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d51b271059ba736f71c5372f713d907f711208ec;p=thirdparty%2Fpostgresql.git

Change errcode for lock_timeout to match NOWAIT

Set errcode to ERRCODE_LOCK_NOT_AVAILABLE

Zoltán Bsöszörményi
---

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index ad258b74fd9..c0667b24e17 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2900,7 +2900,7 @@ ProcessInterrupts(void)
 			DisableNotifyInterrupt();
 			DisableCatchupInterrupt();
 			ereport(ERROR,
-					(errcode(ERRCODE_QUERY_CANCELED),
+					(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 					 errmsg("canceling statement due to lock timeout")));
 		}
 		if (get_timeout_indicator(STATEMENT_TIMEOUT, true))