summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-10-05 19:58:16 +0200
committerunknown <serg@serg.mylan>2005-10-05 19:58:16 +0200
commitfcc644fff735c97d17d6a525a14fd1bd310b26c9 (patch)
treef24d0432b7196a07307a792e64336babd4c3f43b /sql/share
parent7b54f5d6336e848a8d3b5b21d70612b4033913e8 (diff)
downloadmariadb-git-fcc644fff735c97d17d6a525a14fd1bd310b26c9.tar.gz
Bug#12935 Local and XA transactions not mutually exclusive
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index d3964fe6e52..10f0d0691d1 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5311,7 +5311,8 @@ ER_XAER_NOTA XAE04
ER_XAER_INVAL XAE05
eng "XAER_INVAL: Invalid arguments (or unsupported command)"
ER_XAER_RMFAIL XAE07
- eng "XAER_RMFAIL: The command cannot be executed in the %.64s state"
+ eng "XAER_RMFAIL: The command cannot be executed when global transaction is in the %.64s state"
+ rus "XAER_RMFAIL: эту команду нельзя выполнять когда глобальная транзакция находится в состоянии '%.64s'"
ER_XAER_OUTSIDE XAE09
eng "XAER_OUTSIDE: Some work is done outside global transaction"
ER_XAER_RMERR XAE03