bzr push into mysql-5.0-bugteam branch (davi:2704 to 2705)

[Davi Arnaut]

 2705 Davi Arnaut	2008-10-21
      Post-merge fix: drop table at the end of test.
modified:
  mysql-test/r/xa.result
  mysql-test/t/xa.test

 2704 Davi Arnaut	2008-10-21
      Bug#28323: Server crashed in xid cache operations
      
      The problem was that the server did not robustly handle a
      unilateral roll back issued by the Resource Manager (RM)
      due to a resource deadlock within the transaction branch.
      By not acknowledging the roll back, the server (TM) would
      eventually corrupt the XA transaction state and crash.
      
      The solution is to mark the transaction as rollback-only
      if the RM indicates that it rolled back its branch of the
      transaction.
modified:
  mysql-test/r/xa.result
  mysql-test/t/xa.test
  sql/handler.cc
  sql/share/errmsg.txt
  sql/sql_class.h
  sql/sql_parse.cc

=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2008-10-21 18:07:31 +0000
+++ b/mysql-test/r/xa.result	2008-10-21 21:02:26 +0000
@@ -73,4 +73,5 @@ xa end 'a','c';
 ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected
 xa rollback 'a','c';
 xa start 'a','c';
+drop table t1;
 End of 5.0 tests

=== modified file 'mysql-test/t/xa.test'
--- a/mysql-test/t/xa.test	2008-10-21 18:07:31 +0000
+++ b/mysql-test/t/xa.test	2008-10-21 21:02:26 +0000
@@ -116,5 +116,6 @@ xa start 'a','c';
 --disconnect con1
 --disconnect con3
 --connection default
+drop table t1;
 
 --echo End of 5.0 tests