BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/truncate.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/truncate.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
support-files/Makefile.am:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_4998/mysql-4.1


sql-common/client.c:
  Auto merged

(Bug #4998 --protocol doesn't reject bad values)


client/mysql.cc:
  more accurate processing of find_type result
client/mysqladmin.c:
  more accurate processing of find_type result
client/mysqlbinlog.cc:
  more accurate processing of find_type result
client/mysqlcheck.c:
  more accurate processing of find_type result
client/mysqldump.c:
  more accurate processing of find_type result
client/mysqlimport.c:
  more accurate processing of find_type result
client/mysqlshow.c:
  more accurate processing of find_type result
sql-common/client.c:
  more accurate processing of find_type result

mysys/my_lib.c:
  Same fix for bug #4737 that wrongly I did first on tree 4.1
mysys/my_vsnprintf.c:
  Fix VC++ warning assuming that my_vsnprintf() is external
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.0

Bug#4594 column index make = failed for gbk


myisam/mi_key.c:
  cleanup

mysql-test/r/func_set.result:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
mysql-test/t/func_set.test:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators
sql/item_func.cc:
  Fix for bug #4340: find_in_set is case insensitive even on binary operators

Fix master printout


ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix master printout
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Use "configured" socklen_t
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Use "configured" socklen_t
ndb/src/mgmsrv/Services.cpp:
  Use "configured" socklen_t

ndb/src/kernel/blocks/grep/Grep.hpp:
  Remove own addRecSignal-methods
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  Remove own addRecSignal-methods
ndb/src/mgmsrv/MgmtSrvr.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/NdbEventOperation.cpp:
  Compile fix
ndb/src/ndbapi/NdbScanFilter.cpp:
  #ifdef SUNPRO_CC 5.6
ndb/src/ndbapi/TransporterFacade.hpp:
  Compile fix
ndb/test/ndbapi/testIndex.cpp:
  Compile fix

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

   modifying configure.in for the commercial tarballs
 - added my-innodb-heavy-4G.cnf to the distribution


Build-tools/mysql-copyright:
   - make sure to recreate all autoconf/automake-related files after
     modifying configure.in
support-files/Makefile.am:
   - added my-innodb-heavy-4G.cnf to the distribution

into mysql.com:/dbdata/psergey/mysql-4.1-root-root

into mysql.com:/home/jonas/src/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.5066

ndb/src/common/portlib/Makefile.am:
  Rename from .c to .cpp as c++ features needed
ndb/src/common/portlib/NdbTCP.cpp:
  NDB_MUTEX_INITIALIZER isn't preset on SCO unix
ndb/src/ndbapi/Ndbinit.cpp:
  NDB_MUTEX_INITIALIZER isn't preset on SCO unix

into mysql.com:/home/jonas/src/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.5066

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix

into deer.(none):/home/hf/work/mysql-4.1.emb

into poseidon.(none):/home/tomas/mysql-4.1-clean

mysql-test/ndb/ndbcluster.sh:
  stop instead of kill

include/config-win.h:
  Undefine ERROR #defined by WINGDI
sql/sql_class.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_class.h:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members
sql/sql_prepare.cc:
  Fix to compile with msvc: converted static const int Item_arena::* to enum members

We have to include my_pthread.h since it is the place where localtime_r() is declared 
on platforms where this function is missing.


sql-common/my_time.c:
  We have to include my_pthread.h since it is the place where localtime_r() is declared 
  on platforms where this function is missing.

detect change of #replicas + #nodes

into deer.(none):/home/hf/work/mysql-4.1.5066

into deer.(none):/home/hf/work/mysql-4.1.5066

into build.mysql.com:/users/rburnett/mysql-4.1

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


sql/sql_select.cc:
  Auto merged

Fixed error messages


sql/share/czech/errmsg.txt:
  Fixed error message to us long
sql/share/danish/errmsg.txt:
  Fixed error message to us long
sql/share/dutch/errmsg.txt:
  Fixed error message to us long
sql/share/english/errmsg.txt:
  Fixed error message to us long
sql/share/estonian/errmsg.txt:
  Fixed error message to us long
sql/share/french/errmsg.txt:
  Fixed error message to us long
sql/share/german/errmsg.txt:
  Fixed error message to us long
sql/share/greek/errmsg.txt:
  Fixed error message to us long
sql/share/hungarian/errmsg.txt:
  Fixed error message to us long
sql/share/italian/errmsg.txt:
  Fixed error message to us long
sql/share/japanese/errmsg.txt:
  Fixed error message to us long
sql/share/korean/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian-ny/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian/errmsg.txt:
  Fixed error message to us long
sql/share/polish/errmsg.txt:
  Fixed error message to us long
sql/share/portuguese/errmsg.txt:
  Fixed error message to us long
sql/share/romanian/errmsg.txt:
  Fixed error message to us long
sql/share/russian/errmsg.txt:
  Fixed error message to us long
sql/share/serbian/errmsg.txt:
  Fixed error message to us long
sql/share/slovak/errmsg.txt:
  Fixed error message to us long
sql/share/spanish/errmsg.txt:
  Fixed error message to us long
sql/share/swedish/errmsg.txt:
  Fixed error message to us long
sql/share/ukrainian/errmsg.txt:
  Fixed error message to us long
sql/sql_table.cc:
  Fixed uninitialized variable

into build.mysql.com:/users/rburnett/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1