Change errcode for lock_timeout to match NOWAIT

simonat2ndQuadrant · simonat2ndQuadrant · commit d51b271059ba · 2013-06-29T00:57:25.000+01:00
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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -2900,7 +2900,7 @@ ProcessInterrupts(void)`
`2900`	`2900`	`DisableNotifyInterrupt();`
`2901`	`2901`	`DisableCatchupInterrupt();`
`2902`	`2902`	`ereport(ERROR,`
`2903`		`- (errcode(ERRCODE_QUERY_CANCELED),`
	`2903`	`+ (errcode(ERRCODE_LOCK_NOT_AVAILABLE),`
`2904`	`2904`	`errmsg("canceling statement due to lock timeout")));`
`2905`	`2905`	`}`
`2906`	`2906`	`if (get_timeout_indicator(STATEMENT_TIMEOUT, true))`