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 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 sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1

into avenger.(none):/export/brian/mysql/4.1


configure.in:
  Auto merged

 allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping


mysql-test/r/func_gconcat.result:
  allowed parsing of table fields inside aggregate functions
mysql-test/r/subselect.result:
  added new tests of fields resolving in grouping
mysql-test/t/func_gconcat.test:
  allowed parsing of table fields inside aggregate functions
mysql-test/t/subselect.test:
  added new tests of fields resolving in grouping
sql/item_subselect.cc:
  allowed parsing of table fields inside aggregate functions

configure.in:
  Update for gamma status.

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

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

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

   with the sleep value we use for the test suite run during the
   release builds


BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Delete: mysql-test/t/flush_block_commit-master.opt

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1

client.c:
  Removed call to clear_slave_vio in end_server().  Removed header declaration of clear_slave_vio
slave.cc:
  Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()


sql/slave.cc:
  Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
sql-common/client.c:
  Removed call to clear_slave_vio in end_server().  Removed header declaration of clear_slave_vio

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

mysql-test/r/binary.result:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
mysql-test/t/binary.test:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
sql/sql_select.cc:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results

  Don't do this test for now: it fails on Mac OSX.


mysql-test/r/show_check.result:
  Don't do this test for now: it fails on Mac OSX.
mysql-test/t/show_check.test:
  Don't do this test for now: it fails on Mac OSX.

Fix for HEAP+HASH prefix keys.