bzr commit into mysql-5.0 branch (kgeorge:2706)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/merge-5.0-5.1.29-rc/

 2706 Georgi Kodinov	2008-10-23 [merge]
      merged 5.0 main -> 5.0-5.1.29-rc
modified:
  .bzr-mysql/default.conf
  zlib/gzio.c

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-09-20 06:56:33 +0000
+++ b/.bzr-mysql/default.conf	2008-10-10 17:20:42 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.0-bugteam"
+tree_name = "mysql-5.0"

=== 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"