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

  fix configs and scripts


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  fix ports
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  fix ports
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  fix ports
ndb/test/run-test/ndb-autotest.sh:
  minor bugs

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

  fixes


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  dl145 uses /home for running
ndb/test/run-test/make-config.sh:
  output d.txt aswell
ndb/test/run-test/ndb-autotest.sh:
  more scripts updates

  upgrades to shell script


ndb/test/run-test/Makefile.am:
  add config files
ndb/test/run-test/ndb-autotest.sh:
  bump version
  use rsync to sync participating hosts

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

  fix count of nodes needed in test


ndb/test/run-test/conf-daily-basic-dl145a.txt:
  Fix typo
ndb/test/run-test/conf-daily-basic-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Fix typo
ndb/test/run-test/conf-daily-sql-ndbmaster.txt:
  Fix typo
ndb/test/run-test/ndb-autotest.sh:
  Fix count of needed computers for test

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

  fix to ndb-autotest.sh


ndb/test/run-test/ndb-autotest.sh:
  Add bin/ to get access to ndb_cpcc

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

  Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads


ndb/src/cw/cpcd/APIService.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/CPCD.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/src/cw/cpcd/Process.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/include/CpcClient.hpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/run-test/main.cpp:
  Add shutdown options
   (so far only SIGKILL)
ndb/test/src/CpcClient.cpp:
  Add shutdown options
   (so far only SIGKILL)

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

  put config files in bk
  


ndb/test/run-test/make-config.sh:
  Corrent directory
ndb/test/run-test/ndb-autotest.sh:
  Check for 5.1 disrectory structure
  Add config files to distribution
  Remove unpacking for ndb-autotest.sh

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

  use newly created script for faster handling of several configurations


ndb/test/run-test/make-config.sh:
  put cluster config in same config as distribution config
ndb/test/run-test/ndb-autotest.sh:
  1) install mysql_db 
  2) use make-config script

  update make-config script


ndb/test/run-test/make-config.sh:
  update make-config script

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

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


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

  increase no of rows so that the node failure will "guaranteed" produce an aborted transaction


ndb/test/ndbapi/testNodeRestart.cpp:
  increase no of rows so that the node failure will "guaranteed" produce an aborted transaction

  post review fixes


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove printout
  abort transaction instead of operation.
    concider m_exec_flag

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

  Cluster failure with non started nodes can result in timedout transactions


ndb/src/mgmapi/mgmapi.cpp:
  Increase timeout for restarts
ndb/src/ndbapi/ClusterMgr.cpp:
  Report NFCOMPLETEREP if no alive node exists 
    (instead of no connected node exists)
ndb/src/ndbapi/ClusterMgr.hpp:
  Report NFCOMPLETEREP if no alive node exists 
    (instead of no connected node exists)

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged

into mysql.com:/opt/local/work/mysql-5.0-root

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

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


support-files/mysql.server.sh:
  Auto merged

  Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
  (e.g. RHEL3/RHEL4)


support-files/mysql.server.sh:
  - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match
    the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)

into mysql.com:/opt/local/work/mysql-5.0-root


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged

 records if prepared statements is used" (see comments to 
the changed files).


mysql-test/r/ps.result:
  Post-merge fix for Bug#9096: test results fixed.
mysql-test/r/type_datetime.result:
  Post-merge fix for Bug#9096: now we do better constants comparison,
  so the optimizer is able to guess from the index that we don't
  need to evaluate WHERE clause.
sql/item.cc:
  Post-merge fixes for Bug#9096: implement by-value comparison for
  new 5.0 DECIMAL type.
  Item_real is renamed to Item_float in 5.0
  Item_varbinary is renamed to Item_hex_string in 5.0
sql/item.h:
  Post-merge fixes for Bug#9096: declaration for Item_decimal::eq

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

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

  changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places


ndb/src/common/portlib/gcc.cpp:
  remove ndb __cxa_pure_virtual
ndb/src/common/util/new.cpp:
  remove "ndb" new/delete

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

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

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

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