bzr commit into mysql-5.0-bugteam branch (davi:2709)

[Davi Arnaut]

# At a local mysql-5.0-bugteam repository of davi

 2709 Davi Arnaut	2008-10-23 [merge]
      Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam
modified:
  mysql-test/r/xa.result
  mysql-test/t/xa.test
  zlib/gzio.c

=== modified file 'mysql-test/r/xa.result'
--- a/mysql-test/r/xa.result	2008-10-21 17:45:43 +0000
+++ b/mysql-test/r/xa.result	2008-10-23 20:49:33 +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 17:45:43 +0000
+++ b/mysql-test/t/xa.test	2008-10-23 20:49:33 +0000
@@ -116,5 +116,6 @@ xa start 'a','c';
 --disconnect con1
 --disconnect con3
 --connection default
+drop table t1;
 
 --echo End of 5.0 tests

=== modified file 'zlib/gzio.c'
--- a/zlib/gzio.c	2008-08-13 16:44:05 +0000
+++ b/zlib/gzio.c	2008-10-13 12:23:39 +0000
@@ -7,6 +7,11 @@
 
 /* @(#) $Id$ */
 
+/* Need to be included "early" to control other headers */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 
 #include "zutil.h"