diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-23 19:03:26 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-23 19:03:26 -0200 |
| commit | 03300dc1a44f37e33b4c93c1a82babe90ccf28a8 (patch) | |
| tree | 0ae432d3f8a227a22a285eea3b90703a2f39b224 /sql/share | |
| parent | 0d220ba7caf43f1f951d8a81a2f5bd78ffadaf78 (diff) | |
| parent | aafe26f4e94c9a72133d2214077d9bec6285a5be (diff) | |
| download | mariadb-git-03300dc1a44f37e33b4c93c1a82babe90ccf28a8.tar.gz | |
Merge from mysql-5.1-5.1.29-rc into mysql-5.1-bugteam
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 1b278523019..b86007408fb 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" |