MySQL Bugs: #15994: Archive patch makes source tree uncompilable

Bug #15994	Archive patch makes source tree uncompilable
Submitted:	26 Dec 2005 20:11	Modified:	4 Jan 2006 0:45
Reporter:	Ingo Strüwing	Email Updates:
Status:	Can't repeat	Impact on me:	None
Category:	MySQL Server	Severity:	S1 (Critical)
Version:	5.1.5	OS:	Linux (Debian GNU/Linux, slackware)
Assigned to:	Brian Aker	CPU Architecture:	Any

Description:
This patch:

ChangeSet@1.1987, 2005-12-23 17:51:14-08:00, brian@zim.(none)
  Just a few cleanup points in azio. Should solve Ubuntu compile problem. 

makes the source tree uncompilable on systems that do not have zutil.h in the system include path (i.e. in /usr/include).

How to repeat:
BUILD/compile-pentium-debug-max   # on a Debian GNU/Linux

#This should give the error:
...
azlib.h:34:19: zutil.h: No such file or directory
...

The problem might be more than just being able to find zutil.h.
On Gentoo Linux, if I modify azlib.h to include <linux/zutil.h>
rather than <zutil.h>, compilation still fails:

if gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I../../include -I../../include     -DDBUG_OFF -O1   -MT azio.o -MD -MP -MF ".deps/azio.Tpo" -c -o azio.o azio.c; \
then mv -f ".deps/azio.Tpo" ".deps/azio.Po"; else rm -f ".deps/azio.Tpo"; exit 1; fi
In file included from azlib.h:35,
                 from azio.c:16:
/usr/include/zlib.h:82: error: redefinition of `struct z_stream_s'
make: *** [azio.o] Error 1

Same here on Debian. But on a SuSE it worked. They have a /usr/include/zutil.h which seems to be compatible with our stuff. Anyway, it is wrong to use the systems file instead of our own one. I think the mentioned changeset is incomplete. Some Makefile update is missing.

verified on slackware 10.2.

Someone else already fixed this.