diff options
author | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
---|---|---|
committer | Satya B <satya.bn@sun.com> | 2009-07-24 12:15:06 +0530 |
commit | 30441aeadf28f053a75b58ec4c46d25dadc2ba97 (patch) | |
tree | e850059710c4ddef34b737bba2433da01983614e /sql/share | |
parent | 9c708fdf1e0fac8debbfe561a3fd50c9c653a613 (diff) | |
parent | 559e2f1c1e151baec1ec37796640f53af0bd1b30 (diff) | |
download | mariadb-git-30441aeadf28f053a75b58ec4c46d25dadc2ba97.tar.gz |
merge 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 42bca02984d..8cf2fa2463d 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6201,3 +6201,5 @@ ER_TEMPORARY_NAME ER_RENAMED_NAME eng "Renamed" swe "Namnändrad" +ER_TOO_MANY_CONCURRENT_TRXS + eng "Too many active concurrent transactions" |