List:Commits« Previous MessageNext Message »
From:Stewart Smith Date:December 28 2005 4:33am
Subject:bk commit into 5.1 tree (stewart:1.2002)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.2002 05/12/28 15:33:48 stewart@stripped +2 -0
  build fixes for azio on systems without zutil.h

  storage/archive/azlib.h
    1.4 05/12/28 15:33:43 stewart@stripped +0 -1
    don't use zutil.h, it's private to zlib

  storage/archive/azio.c
    1.5 05/12/28 15:33:43 stewart@stripped +6 -5
    Build fixes for not having zutil.h
    
    use memset instead of zmemzero.
    
    use 8 as memory usage level (the default, which we were using anyway)
    
    in the .gz header, just say we're UNIX.
    
    use memcpy instead of zmemcpy.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/new

--- 1.4/storage/archive/azio.c	2005-12-25 22:29:40 +11:00
+++ 1.5/storage/archive/azio.c	2005-12-28 15:33:43 +11:00
@@ -12,6 +12,7 @@
 /* @(#) $Id$ */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "azlib.h"
 
@@ -51,8 +52,8 @@
   s->stream.zalloc = (alloc_func)0;
   s->stream.zfree = (free_func)0;
   s->stream.opaque = (voidpf)0;
-  zmemzero(s->inbuf, Z_BUFSIZE);
-  zmemzero(s->outbuf, Z_BUFSIZE);
+  memset(s->inbuf, 0, Z_BUFSIZE);
+  memset(s->outbuf, 0, Z_BUFSIZE);
   s->stream.next_in = s->inbuf;
   s->stream.next_out = s->outbuf;
   s->stream.avail_in = s->stream.avail_out = 0;
@@ -73,7 +74,7 @@
     err = Z_STREAM_ERROR;
 #else
     err = deflateInit2(&(s->stream), level,
-                       Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+                       Z_DEFLATED, -MAX_WBITS, 8, strategy);
     /* windowBits is passed < 0 to suppress zlib header */
 
     s->stream.next_out = s->outbuf;
@@ -114,7 +115,7 @@
     /* Write a very simple .gz header:
   */
     snprintf(buffer, 10, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-            Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+            Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, 0x03);
     s->start = 10L;
     my_write(s->file, buffer, s->start, MYF(0));
     /* We use 10L instead of ftell(s->file) to because ftell causes an
@@ -317,7 +318,7 @@
       uInt n = s->stream.avail_in;
       if (n > s->stream.avail_out) n = s->stream.avail_out;
       if (n > 0) {
-        zmemcpy(s->stream.next_out, s->stream.next_in, n);
+        memcpy(s->stream.next_out, s->stream.next_in, n);
         next_out += n;
         s->stream.next_out = (Bytef *)next_out;
         s->stream.next_in   += n;

--- 1.3/storage/archive/azlib.h	2005-12-24 12:51:03 +11:00
+++ 1.4/storage/archive/azlib.h	2005-12-28 15:33:43 +11:00
@@ -31,7 +31,6 @@
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
-#include <zutil.h>
 #include <zlib.h>
 
 #include "../../mysys/mysys_priv.h"
Thread
bk commit into 5.1 tree (stewart:1.2002)Stewart Smith28 Dec