From 180ed3e47f0a378ba140a40a1b869fc183a837c2 Mon Sep 17 00:00:00 2001
From: calvin <>
Date: Wed, 9 Sep 2009 14:26:29 +0000
Subject: [PATCH] branches/5.1: merge change from 5.1.38

HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38.
---
 handler/ha_innodb.cc | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/handler/ha_innodb.cc b/handler/ha_innodb.cc
index b9dbeb7045d..81481837cb6 100644
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
@@ -734,17 +734,7 @@ convert_error_code_to_mysql(
     		return(HA_ERR_LOCK_TABLE_FULL);
 	} else if (error == DB_TOO_MANY_CONCURRENT_TRXS) {
 
-		/* Once MySQL add the appropriate code to errmsg.txt then
-		we can get rid of this #ifdef. NOTE: The code checked by
-		the #ifdef is the suggested name for the error condition
-		and the actual error code name could very well be different.
-		This will require some monitoring, ie. the status
-		of this request on our part.*/
-#ifdef ER_TOO_MANY_CONCURRENT_TRXS
-		return(ER_TOO_MANY_CONCURRENT_TRXS);
-#else
-		return(HA_ERR_RECORD_FILE_FULL);
-#endif
+		return(HA_ERR_TOO_MANY_CONCURRENT_TRXS);
 
 	} else if (error == DB_UNSUPPORTED) {