From 5204e11d9cdf5cbbd246b32ce7d02fc191c23279 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 28 Aug 2012 18:56:20 +0200
Subject: [PATCH] Backported recent "cannotAcquireLockCodes" additions

Issue: SPR-9141
Issue: SPR-9681
---
 .../org/springframework/jdbc/support/sql-error-codes.xml     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
index 9e07f3932b..a6a0f5c836 100644
--- a/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
+++ b/org.springframework.jdbc/src/main/resources/org/springframework/jdbc/support/sql-error-codes.xml
@@ -181,7 +181,7 @@
 			<value>17002,17447</value>
 		</property>
 		<property name="cannotAcquireLockCodes">
-			<value>54</value>
+			<value>54,30006</value>
 		</property>
 		<property name="cannotSerializeTransactionCodes">
 			<value>8177</value>
@@ -240,6 +240,9 @@
 		<property name="transientDataAccessResourceCodes">
 			<value>921,1105</value>
 		</property>
+		<property name="cannotAcquireLockCodes">
+			<value>12205</value>
+		</property>
 		<property name="deadlockLoserCodes">
 			<value>1205</value>
 		</property>