Commit 5b8c8a6c authored by Davi Arnaut's avatar Davi Arnaut
Browse files

Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam

parents a68f6a9c b6fbc38c

mysql-test/r/xa.result

+1 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/xa.test

+1 −0
Original line number Diff line number Diff line
@@ -116,5 +116,6 @@ xa start 'a','c'; 
--disconnect con1

--disconnect con3

--connection default

drop table t1;



--echo End of 5.0 tests

zlib/gzio.c

+5 −0
Original line number Diff line number Diff line
@@ -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"