bzr push into mysql-5.1 branch (davi:2771 to 2772)

[Davi Arnaut]

 2772 Davi Arnaut	2008-10-21 [merge]
      Merge post-merge fix from mysql-5.0-bugteam.
modified:
  mysql-test/r/xa.result
  mysql-test/t/xa.test

 2771 Davi Arnaut	2008-10-21 [merge]
      Merge Bug#28323 to mysql-5.1.29-rc
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