Commit b6fbc38c authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merged 5.0 main -> 5.0-5.1.29-rc

parents e139d9c7 bc51b15d

.bzr-mysql/default.conf

+1 −1
Original line number Diff line number Diff line 
[MYSQL]

post_commit_to = "commits@lists.mysql.com"

post_push_to = "commits@lists.mysql.com"

tree_name = "mysql-5.0-bugteam"
 
tree_name = "mysql-5.0"

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"