List:Commits« Previous MessageNext Message »
From:sergeyv Date:January 12 2006 2:32pm
Subject:bk commit into 5.0 tree (SergeyV:1.2043) BUG#15787
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2043 06/01/12 17:32:39 SergeyV@selena. +2 -0
  Fixes bug #15787. Fix makes available _FILE_OFFSET_BITS definition for
  zlib library in order to enable support of files larger than 2Gb.
  Providing an effective test is hardly possible, since the problem starts
  only when archive table becomes larger than 2Gb.

  zlib/zconf.h
    1.6 06/01/12 17:25:01 SergeyV@selena. +4 -0
    Includes config.h in order to make _FILE_OFFSET_BITS definition available.

  zlib/gzio.c
    1.6 06/01/12 17:25:00 SergeyV@selena. +2 -2
    Move include of zutil.h on top of gzio.c to include chain of
    zutil.h->zlib.h->zconf.h->config.h before including anything else.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#15787-mysql-5.0

--- 1.5/zlib/gzio.c	2005-09-22 02:17:45 +04:00
+++ 1.6/zlib/gzio.c	2006-01-12 17:25:00 +03:00
@@ -7,9 +7,9 @@
 
 /* @(#) $Id$ */
 
-#include <stdio.h>
-
 #include "zutil.h"
+
+#include <stdio.h>
 
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS

--- 1.5/zlib/zconf.h	2005-09-22 02:17:45 +04:00
+++ 1.6/zlib/zconf.h	2006-01-12 17:25:01 +03:00
@@ -8,6 +8,10 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
Thread
bk commit into 5.0 tree (SergeyV:1.2043) BUG#15787sergeyv12 Jan