diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-23 18:56:03 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-10-23 18:56:03 -0200 |
| commit | 5bc2ad279d7f35100b4f580045f2c646e9a8b90b (patch) | |
| tree | 3c1ae04ba82c59496fb95a973098e10fa3b12594 | |
| parent | 2559cd1ce509b86d43c0a47c48d98bbce70239b8 (diff) | |
| parent | 0b6eee262f88ac06bd36ce9abe491cf21e9f42ee (diff) | |
| download | mariadb-git-5bc2ad279d7f35100b4f580045f2c646e9a8b90b.tar.gz | |
Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam
| -rw-r--r-- | mysql-test/r/xa.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/xa.test | 1 | ||||
| -rw-r--r-- | zlib/gzio.c | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/xa.result b/mysql-test/r/xa.result index 25d09f59247..592cf07522b 100644 --- a/mysql-test/r/xa.result +++ b/mysql-test/r/xa.result @@ -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 diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test index 8f408fb1eda..591d7ac2c4d 100644 --- a/mysql-test/t/xa.test +++ b/mysql-test/t/xa.test @@ -116,5 +116,6 @@ xa start 'a','c'; --disconnect con1 --disconnect con3 --connection default +drop table t1; --echo End of 5.0 tests diff --git a/zlib/gzio.c b/zlib/gzio.c index 7e90f4928fc..ed4e77ca7e9 100644 --- a/zlib/gzio.c +++ b/zlib/gzio.c @@ -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" |