made compare of logs possible in ndb test
restart_log.result, restart.test, restart.result:
  new file


mysql-test/ndb/ndbcluster.sh:
  made compare of logs possible in ndb test

  added test switch
basic_log.result, basic.test, basic.result:
  new file


mysql-test/ndb/ndbcluster.sh:
  added test switch

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

  Print a better error message to the .err log if InnoDB's advisory file locking fails


innobase/os/os0file.c:
  Print a better error message to the .err log if InnoDB's advisory file locking fails

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

+ some extra debug printouts


mysql-test/ndb/ndbcluster.sh:
  fixed debug flag in ndbcluster start script
ndb/include/debugger/EventLogger.hpp:
  bug #7104
ndb/include/kernel/LogLevel.hpp:
  bug #7104
ndb/src/common/debugger/EventLogger.cpp:
  bug #7104
ndb/src/common/portlib/NdbTCP.cpp:
  removed debug printout in Ndb_getInAddr
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  bug #7104
ndb/src/mgmapi/mgmapi.cpp:
  bug #7104
ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug #7104
ndb/src/mgmsrv/MgmtSrvr.hpp:
  bug #7104
ndb/src/mgmsrv/Services.cpp:
  bug #7104
ndb/src/ndbapi/TransporterFacade.cpp:
  bug #7104

into mysql.com:/home/stewart/Documents/MySQL/4.1/ndb-pristine


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

""show_check" fails on 64bit platforms": now minimal rec_length
of a HEAP table >= sizeof(void*), hence it's platform-dependant.


mysql-test/r/show_check.result:
  Fix test results for 64-bit platforms.
mysql-test/t/show_check.test:
  Ignore two more columns of output of show table status: it's different
  on 64-bit and 32-bit platforms.

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

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


sql/sql_parse.cc:
  Auto merged

sql/item_cmpfunc.cc:
  comment fixed
sql/item_subselect.cc:
  comment fixed
  debug info and inherited method call
sql/item_subselect.h:
  comment fixed
sql/item_sum.cc:
  comment fixed
sql/item_sum.h:
  comment fixed

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

BitKeeper/etc/ignore:
  Added analyse.test client/mysqladmin.c to the ignore list
libmysql/libmysql.c:
  Fix for a bug #6996
  
  This fix enables that after all rows are read from a buffered result,
  mysql_stmt_data_seek(stmt,0) can rewind a counter to the beginning,
  so that rows can be re-fetched.
tests/client_test.c:
  Addition of a test for fix of the bug #6996 in client_test.c

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

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993

    uppercase printout


ndb/include/util/BaseString.hpp:
  added returntype BaseString& for ndb_upper and ndb_lower instead of void
ndb/src/mgmclient/CommandInterpreter.cpp:
  uppercase printout

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6993

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

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

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

mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/t/key_cache.test:
  Auto merged
sql/field.cc:
  Auto merged

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

ndb/src/mgmsrv/CommandInterpreter.cpp:
  removed clusterlog command
ndb/src/mgmsrv/CommandInterpreter.hpp:
  removed clusterlog command

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

sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Starting ndb_mgmd on a host which isn't in the configuration file as the ndb_mgmd 
(e.g. the ip address is different) would have ndb_mgmd segfault.

There was a check in the code, but it was (potentially) trying to dereference null


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Don't try and print client_addr->sin_addr if client_addr is null

Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test.


mysql-test/r/have_exampledb.require:
  Fix for test for examples.
sql/examples/ha_archive.cc:
  Fix for compiler that had problem with ANSI C.

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

Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file