bk commit into 4.1 tree (joerg:1.2377)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg 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.2377 05/08/03 20:03:21 joerg@stripped +33 -0
  Manual merge: Current 4.1.14 has precedence over 4.1.10b

  support-files/mysql.spec.sh
    1.102 05/08/03 20:03:17 joerg@stripped +0 -14
    Manual merge: Current 4.1.14 has precedence over 4.1.10b

  configure.in
    1.386 05/08/03 20:03:17 joerg@stripped +0 -1
    Manual merge: Current 4.1.14 has precedence over 4.1.10b

  zlib/zutil.h
    1.4 05/08/03 19:57:27 joerg@stripped +0 -6
    Auto merged

  zlib/zlib.h
    1.4 05/08/03 19:57:27 joerg@stripped +0 -15
    Auto merged

  zlib/zlib.3
    1.4 05/08/03 19:57:27 joerg@stripped +0 -3
    Auto merged

  zlib/zconf.h
    1.4 05/08/03 19:57:27 joerg@stripped +0 -44
    Auto merged

  zlib/trees.c
    1.4 05/08/03 19:57:27 joerg@stripped +0 -2
    Auto merged

  zlib/inftrees.h
    1.5 05/08/03 19:57:27 joerg@stripped +0 -5
    Auto merged

  zlib/inftrees.c
    1.5 05/08/03 19:57:27 joerg@stripped +0 -13
    Auto merged

  zlib/inflate.c
    1.4 05/08/03 19:57:27 joerg@stripped +0 -4
    Auto merged

  zlib/inffast.c
    1.4 05/08/03 19:57:26 joerg@stripped +0 -2
    Auto merged

  zlib/infback.c
    1.3 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  zlib/gzio.c
    1.4 05/08/03 19:57:26 joerg@stripped +0 -4
    Auto merged

  zlib/deflate.h
    1.4 05/08/03 19:57:26 joerg@stripped +0 -0
    Auto merged

  zlib/deflate.c
    1.4 05/08/03 19:57:26 joerg@stripped +0 -2
    Auto merged

  zlib/crc32.c
    1.4 05/08/03 19:57:26 joerg@stripped +0 -49
    Auto merged

  zlib/README
    1.5 05/08/03 19:57:26 joerg@stripped +0 -4
    Auto merged

  zlib/INDEX
    1.5 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  zlib/FAQ
    1.5 05/08/03 19:57:26 joerg@stripped +0 -55
    Auto merged

  zlib/ChangeLog
    1.4 05/08/03 19:57:26 joerg@stripped +0 -42
    Auto merged

  acinclude.m4
    1.135 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/mysqlmanager/mysqlmanager.dsp
    1.13 05/08/03 19:57:26 joerg@stripped +0 -2
    Auto merged

  VC++Files/mysqlcheck/mysqlcheck.dsp
    1.12 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/mysqlbinlog/mysqlbinlog.dsp
    1.16 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/mysql-test/mysql_test_run_new.dsp
    1.6 05/08/03 19:57:26 joerg@stripped +0 -2
    Auto merged

  VC++Files/client/mysqltest.dsp
    1.5 05/08/03 19:57:26 joerg@stripped +0 -2
    Auto merged

  VC++Files/client/mysqlshow.dsp
    1.12 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/client/mysqlimport.dsp
    1.12 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/client/mysqldump.dsp
    1.13 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/client/mysqlcheck.dsp
    1.5 05/08/03 19:57:26 joerg@stripped +0 -1
    Auto merged

  VC++Files/client/mysqladmin.dsp
    1.13 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  VC++Files/client/mysql.dsp
    1.14 05/08/03 19:57:26 joerg@stripped +0 -3
    Auto merged

  BitKeeper/etc/config
    1.14 05/08/03 19:57:26 joerg@stripped +0 -1
    Auto merged

# 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:	joerg
# Host:	trift2.
# Root:	/M41/clone-4.1.10a/RESYNC