into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Added the blackhole storage engine to the Max builds


VC++Files/sql/mysqld.dsp:
  Added the blackhole storage engine to the Max builds

into mysql.com:/space/my/mysql-4.1-build


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  the rpm spec file changelog


sql/ha_innodb.cc:
  - Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
  - manual merge from 4.0

  the MySQL-server RPM spec file (BUG#12348)


support-files/mysql.spec.sh:
  - Fixed the creation of the mysql user group account in the postinstall section
   (BUG#12348)

support-files/mysql.spec.sh:
  - fixed enabling the Archive storage engine for the mysqld-max binary

Adds --replace_column to make test results deterministic.


mysql-test/r/rpl_slave_status.result:
  BUG#12330 updated result file which I missed in last changeset
  This updates the test to use --replace_column to make the test
  deterministic.

into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330

mysql-test/t/rpl_slave_status.test:
  Add --replace-column to make show slave status deterministic

into mysql.com:/M41/mysql-4.1

BitKeeper/etc/config:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlcheck.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/client/mysqltest.dsp:
  Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
  Auto merged
acinclude.m4:
  Auto merged
zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/INDEX:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged

into mysql.com:/space/my/mysql-4.1

into  hundin.mysql.fi:/home/heikki/mysql-4.1

  Fix compilation error in previous commit


sql/ha_innodb.cc:
  Fix compilation error in previous commit

  Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later


innobase/buf/buf0buf.c:
  Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later

into  hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged

  Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)


sql/ha_innodb.cc:
  Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)

 - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp


ndb/src/common/portlib/NdbMutex.c:
   - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/src/common/portlib/NdbThread.c:
   - Moved a DBUG_ENTER statement after the variable declarations to satisfy some
     compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r)
ndb/tools/config.cpp:
   - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll()

  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.


sql/item_sum.cc:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.

  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.


sql/sql_class.h:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
sql/sql_select.cc:
  Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.

into mysql.com:/space/my/mysql-4.1-build

  required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.

into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1

FULLTEXT non-functional for big5 strings


mysql-test/r/ctype_big5.result:
  Test case for BUG#12075.
mysql-test/t/ctype_big5.test:
  Test case for BUG#12075.
strings/ctype-big5.c:
  hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now

into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1


myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.

Repair crashes mysql when table has fulltext index.


myisam/sort.c:
  Use static ft_buf instead of dynamic mergebuf. Latter could be NULL if record has long words.
mysql-test/r/fulltext.result:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.
mysql-test/t/fulltext.test:
  Test case for BUG#11684 - repair crashes mysql when table has fulltext index.

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
mysql-test/t/func_math.test:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/user_var.test:
  Resolve conflict

into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Modified test case for bug #12144.


mysql-test/t/null_key.test:
  Modified test case for bug #12144.
mysql-test/r/null_key.result:
  Modified test case for bug #12144.

into rurik.mysql.com:/home/igor/mysql-4.1

If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.

to connect


mysql-test/r/rpl_slave_status.result:
  updated result
mysql-test/t/rpl_slave_status.test:
  user vertical result
sql/slave.cc:
  reversed an unnecessary change for BUG#10780
sql/slave.h:
  reversed an unnecessary change for BUG#10780

macro floatget was missing in config-win.h

- upgrade zlib to 1.2.2
  (originally:  2005/03/23 21:08:13+01:00 serg@serg.mylan )
- fixed linking with zlib
  (originally:  2005/05/24 22:42:43+02:00 lenz@mysql.com )
- one more build fix for zlib.lib - added libpath to the mysql_test_run_new project files
  (originally:  2005/05/25 10:55:21+02:00 lenz@mysql.com )
- Do not build the RPMs statically on i386 by default, only when adding either
  "--with static" or "--define '_with_static 1'" to the RPM build options.
  Static linking really only makes sense when linking against the specially patched
  glibc 2.2.5.
  (originally:  2005/06/14 21:39:08+02:00 lenz@mysql.com )
- Apply security patch to bundled zlib for CAN-2005-2096. (Bug #11844)
  (originally:  2005/07/11 10:37:21-07:00 jimw@mysql.com )
- applied a security fix to inftrees.h from the bundled zlib to resolve a second
  potential zlib security vulnerability (CAN-2005-1849). Fix was taken from the
  official zlib-1.2.3 distribution (no other zlib-1.2.3 changes were applied)
  (originally:  2005/07/27 14:55:08+02:00 lenz@mysql.com )
- build the RPM binaries against the bundled zlib, when static linking is requested
  (originally:  2005/07/27 16:42:13+02:00 lenz@mysql.com )


VC++Files/client/mysql.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqldump.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new.dsp:
  - added zlib.lib to the LINK32 options
  - added libpath option so that zlib.lib will be found
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
  - added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
  - added zlib.lib to the LINK32 options
acinclude.m4:
  clarify help text
support-files/mysql.spec.sh:
  - Do not build statically on i386 by default, only when adding either "--with
    static" or "--define '_with_static 1'" to the RPM build options. Static
    linking really only makes sense when linking against the specially patched
    glibc 2.2.5.
  - build against the bundled zlib, when linking statically
zlib/ChangeLog:
  upgrade zlib to 1.2.2
zlib/FAQ:
  upgrade zlib to 1.2.2
zlib/INDEX:
  upgrade zlib to 1.2.2
zlib/README:
  upgrade zlib to 1.2.2
zlib/crc32.c:
  upgrade zlib to 1.2.2
zlib/deflate.c:
  upgrade zlib to 1.2.2
zlib/deflate.h:
  upgrade zlib to 1.2.2
zlib/gzio.c:
  upgrade zlib to 1.2.2
zlib/infback.c:
  upgrade zlib to 1.2.2
zlib/inffast.c:
  upgrade zlib to 1.2.2
zlib/inflate.c:
  upgrade zlib to 1.2.2
zlib/inftrees.c:
  upgrade zlib to 1.2.2
  Apply security patch for CAN-2005-2096
zlib/inftrees.h:
  upgrade zlib to 1.2.2
  applied another security fix to resolve CAN-2005-1849, taken from the 1.2.3 zlib sources
zlib/trees.c:
  upgrade zlib to 1.2.2
zlib/zconf.h:
  upgrade zlib to 1.2.2
zlib/zlib.3:
  upgrade zlib to 1.2.2
zlib/zlib.h:
  upgrade zlib to 1.2.2
zlib/zutil.h:
  upgrade zlib to 1.2.2

  (thanks to JoergB for spotting it)


VC++Files/client/mysqlclient_ia64.dsp:
  - fixed a typo: ctype-cp963.c -> ctype-cp932.c (thanks to JoergB for spotting it)

BitKeeper/etc/config:
  Using licensed version now.