summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-07-17 14:13:53 +0530
committerSatya B <satya.bn@sun.com>2009-07-17 14:13:53 +0530
commit342553252fc0315762abe3491889491728d06998 (patch)
treea20fc98e70384f275c89e5cf5e57bdd252b932b4 /sql/share
parent1a4bc9a1e429697f86f63f2599e49a4f2d29cd32 (diff)
downloadmariadb-git-342553252fc0315762abe3491889491728d06998.tar.gz
Fix for BUG#18828 - If InnoDB runs out of undo slots,
it returns misleading 'table is full' Innodb returns a misleading error message "table is full" when the number of active concurrent transactions is greater than 1024. Fixed by adding errorcode "ER_TOO_MANY_CONCURRENT_TRXS" to the error codes. Innodb should return HA_TOO_MANY_CONCURRENT_TRXS to mysql which is then mapped to ER_TOO_MANY_CONCURRENT_TRXS Note: testcase is not written as this was reproducible only by changing innodb code. extra/perror.c: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS include/my_base.h: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS sql/ha_innodb.cc: Return HA_ERR_TOO_MANY_CONCURRENT_TRXS to mysql server sql/handler.cc: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS sql/share/errmsg.txt: Add error message for ER_TOO_MANY_CONCURRENT_TRXS
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index c688ba88b7b..2b43ba099e3 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5649,3 +5649,5 @@ ER_XA_RBTIMEOUT XA106
eng "XA_RBTIMEOUT: Transaction branch was rolled back: took too long"
ER_XA_RBDEADLOCK XA102
eng "XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected"
+ER_TOO_MANY_CONCURRENT_TRXS
+ eng "Too many active concurrent transactions"