ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#4591
  Wait for not started instead of (! no contact)

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

1) merge join
2) lookups

ndb/src/ndbapi/NdbOperationInt.cpp:
  Fix so that interpreter is possible together with index scans
ndb/test/ndbapi/Makefile.am:
  New test prog

into mysql.com:/space/pekka/ndb/version/my41-tux


ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)


sql/ha_ndbcluster.cc:
  Removed errornous hupp, which made handler commit same transid several times
  (which is checked when running in debug mode)

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
  seeror set method for signal handler
ndb/src/kernel/main.cpp:
  adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
  adder error insert for error during shutdown
  + check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
  enum so signal that Shatdown is invoked by signal handler

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

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

make *sure* that no one gets same transid twice
(wo/ restarting process)

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

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

  Minor edits to help command messages.


client/mysql.cc:
  Minor edits to help command messages.

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

into mysql.com:/Users/mikron/mysql-4.1-ndb

  Forgot to push in the previous changeset


mysql-test/r/grant.result:
  Forgot to push in the previous changeset

into mysql.com:/space/pekka/ndb/version/my41

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

 with old libedit and readline

1. discarded reading and writting of hist_cookie as the begin of the file
2. skip strvis for string before saving



cmd-line-utils/libedit/history.c:
  fixed format of history for compatibility with old libedit and readline
  
  1. discarded reading and writting of hist_cookie as the begin of file
  2. skip strvis for string before saving

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

ndb/src/ndbapi/NdbBlob.cpp:
  theBlobTable is NULL for tinyblob

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


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/ndb_global.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged

mysql-test/ndb/ndbcluster.sh:
  use new shutdown command
ndb/src/common/mgmcommon/Makefile.am:
  compile error fix

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

ndb/test/ndbapi/testOIBasic.cpp:
  null related options, not related to this changeset

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


ndb/test/ndbapi/testDict.cpp:
  Auto merged

ndb/src/mgmsrv/InitConfigFileParser.hpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.hpp -> ndb/src/mgmsrv/InitConfigFileParser.hpp
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Rename: ndb/src/common/mgmcommon/InitConfigFileParser.cpp -> ndb/src/mgmsrv/InitConfigFileParser.cpp
ndb/src/mgmsrv/ConfigInfo.hpp:
  Rename: ndb/src/common/mgmcommon/ConfigInfo.hpp -> ndb/src/mgmsrv/ConfigInfo.hpp
ndb/src/common/mgmcommon/Makefile.am:
  moved files to mgmsrv
ndb/src/mgmclient/CommandInterpreter.cpp:
  added shutdown command
ndb/src/mgmclient/CommandInterpreter.hpp:
  added shutdown command
ndb/src/mgmsrv/Config.cpp:
  .
ndb/src/mgmsrv/Config.hpp:
  .
ndb/src/mgmsrv/ConfigInfo.cpp:
  wait with this
ndb/src/mgmsrv/Makefile.am:
  moved files to mgmsrv
ndb/test/include/NdbBackup.hpp:
  backup not necessarily in file system path
ndb/test/ndbapi/testDict.cpp:
  compile error
ndb/test/src/NdbBackup.cpp:
  aligned with new config param

into mysql.com:/usr/home/bar/mysql-4.1

  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.


mysql-test/r/grant.result:
  Bug 4338 mysql-test-run fails if compiled with non-latin1 character set: partual fix.

Fixed missing initialisation bug


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  4 times number of nodes is decreases worst case compared to
  8 times number of node groups
  Missing initialisation
ndb/src/kernel/vm/pc.hpp:
  Decreased chunks per fragment