merged 5.0 main -> 5.0-5.1.29-rc

b6fbc38c · Georgi Kodinov · e139d9c7 · bc51b15d · b6fbc38c · b6fbc38c
Commit b6fbc38c authored Oct 23, 2008 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

.bzr-mysql/default.conf .bzr-mysql/default.conf +1 -1

zlib/gzio.c zlib/gzio.c +5 -0

No files found.
--- a/.bzr-mysql/default.conf
+++ b/.bzr-mysql/default.conf
 [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"
--- 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"