From 52b7c6b11c81370f1306f679d1cdf20626e473aa Mon Sep 17 00:00:00 2001 From: Joerg Bruehe Date: Sat, 4 Oct 2008 18:32:23 +0200 Subject: [PATCH 1/2] Fix some bad merge that got the string "5.1-bugteam" into this 5.0 tree. .bzr-mysql/default.conf: 1) Thou shalt not have a team tree designation in this file. 2) Thou shalt not claim "5.1" in a "5.0" tree. --- .bzr-mysql/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index e613cefc614..f79c1cd6319 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com" -tree_name = "mysql-5.1-bugteam" +tree_name = "mysql-5.0" From 12173de37bf7fd777f865f8745d8786508ee5094 Mon Sep 17 00:00:00 2001 From: Kent Boortz Date: Mon, 13 Oct 2008 14:23:39 +0200 Subject: [PATCH 2/2] The header "config.h" needs to be included "early" to control other headers. This time the inclusion of before "config.h" enabled legacy large file support, seek64() and similar, on AIX breaking the compile of "gzio.c" --- zlib/gzio.c | 5 +++++ 1 file changed, 5 insertions(+) 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 +#endif + #include #include "zutil.h"