diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-21 18:28:01 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-21 18:28:01 -0200 |
| commit | d7263d2a70f4faad959f42c784877e6169b03fdd (patch) | |
| tree | 0776aac0cdf2bb165a1ff1ea2c6cf0a1dc7f6d8d /sql/share | |
| parent | 0c20c0f12ff15601e23bd45bcda70317a59d9380 (diff) | |
| parent | 41dd7b6b92ce8e3c2ccb5aa9ebeef12be746793e (diff) | |
| download | mariadb-git-d7263d2a70f4faad959f42c784877e6169b03fdd.tar.gz | |
Merge Bug#28323 to mysql-5.1.29-rc
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 84eb5f5ba64..c6fa5366f46 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6128,6 +6128,12 @@ ER_LOAD_DATA_INVALID_COLUMN ER_LOG_PURGE_NO_FILE eng "Being purged log %s was not found" +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_NEED_REPREPARE eng "Prepared statement needs to be re-prepared" |