bzr push into mysql-5.5 branch (jon.hauglid:3754 to 3755) Bug#13833438

[Jon Olav Hauglid]

 3755 Jon Olav Hauglid	2012-03-15
      Bug#13833438: ERROR CODES MUST HAVE SAME VALUE ACROSS MYSQL VERSIONS
      
      Pre-requisite patch.
      Add end-of-file marker to 5.5 version of errmsg-utf8.txt.

    modified:
      sql/share/errmsg-utf8.txt
 3754 Dmitry Shulga	2012-03-15
      This patch fixes the bug#13737343 (formerly known as 64374): XA TRANSACTIONS
      AND SAVEPOINT.
            
      The bug was introduced by the patch for bug#11766752. This patch sets too
      strong condition on XA state for SAVEPOINT statement that disallows its
      execution during XA transaction. But since the statement SAVEPOINT doesn't
      imply implicit commit we can allow its handling during XA transaction.
      
      The patch explicitly check for transaction state against states XA_NOTR
      and XA_ACTIVE for which the handling of statement SAVEPOINT for XA
      transaction is allowed.
     @ mysql-test/t/xa.test
        Testcase was adjusted for bug#13737343. Now SAVEPOINT is allowed for XA
        transactions in ACTIVE state.

    modified:
      mysql-test/r/xa.result
      mysql-test/t/xa.test
      sql/transaction.cc
=== modified file 'sql/share/errmsg-utf8.txt'
--- a/sql/share/errmsg-utf8.txt	2012-02-09 17:58:33 +0000
+++ b/sql/share/errmsg-utf8.txt	2012-03-15 09:15:50 +0000
@@ -6494,3 +6494,6 @@ ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT
 ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC
   eng "CREATE TABLE... SELECT...  on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave."
 
+#
+#  End of 5.5 error messages.
+#

No bundle (reason: useless for push emails).