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

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

  fix bug in test prg

  fix bug in handling of inactive timeout for scan, when all is delivered


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) set timeout if all scans are at api
  2) Use c_appl_timeout_value when getting scan timeout
ndb/test/ndbapi/testTimeout.cpp:
  test program

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly


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

smaller patch for 5.0.

complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc


ndb/include/mgmapi/mgmapi.h:
  add internal get_fd to use in test
ndb/include/util/InputStream.hpp:
  - add this weird startover member to SocketInputStream
      - this helps work out if we've read a newline yet and should start inserting
           into buffer from the start
ndb/src/common/util/InputStream.cpp:
  remove evil, add more.
  
  keep track internally we've retrieved a newline yet (m_startover)
ndb/src/common/util/Parser.cpp:
  change way detecting of NoLine
  
  remove some trailing whitespace that was uglying the place up a bit
ndb/src/common/util/socket_io.cpp:
  Always retrieve data from the OS so that we instantly get EOF on disconnect
  and don't end up spinning looking for a newline.
ndb/src/mgmapi/mgmapi.cpp:
  add internal ndb_mgm_get_fd() for internal testing
  
  handle 'node status' a bit better
ndb/test/ndbapi/testMgm.cpp:
  Add test for MgmApiSession disconnection (mgmd at 100%)
  
  not fully automated due to smaller patch for 5.0
  
  will be complete in 5.1

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


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/include/ndb_version.h.in:
  merge

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb-bj


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
ndb/src/mgmclient/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
ndb/tools/ndb_config.cpp:
  merge

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651


ndb/test/ndbapi/flexScan.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.hpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  C

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651

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


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix take-over during SR

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

  handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

  Fix occational LCP hang!!!
  Make sure only to consider alive nodes in startNextChkpt


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure only to consider alive nodes in startNextChkpt

ndb/tools/restore/consumer.hpp:
  added a function to judge whether there is temporary error.
ndb/tools/restore/consumer_restore.cpp:
  record when temporary error occured in restore.
ndb/tools/restore/consumer_restore.hpp:
  added a member to record temporary error in restore.
ndb/tools/restore/restore_main.cpp:
  report temporary error in restore.

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21585

          and other commands related to ndb. For all of these, the help screen contains
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from "Ndb.cfg" string to "my.cnf" string in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".
ndb/tools/ndb_config.cpp:
  Change help info from including "Ndb.cfg" to "my.cnf".

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged

add judgement to avoid NULL pointer's operation(segmentaion fault)


ndb/src/ndbapi/NdbOperation.cpp:
  if getColumn return NULL, set error code and return NULL in getBlobHandle
ndb/src/ndbapi/ndberror.c:
  change the err message more appropriate

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

          the following start, stop and restart operations aren't execute correctly


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Adding some source codes check node list whether or not stopped for STOP_REQ signal.
  If all of these nodes have stopped, then STOP_CONF signal will return.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Ensure ndb_mgm can only transmit the valid range node id to management server.
  if the node id is greater than MAX_NODES, management server will exit abnormally.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Ensure management server can only transmit the data node id to data node process.

           and other commands related to ndb. For all of these, the help screen contains 
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from Ndb.cfg to my.cnf in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from Ndb.cfg to my.cnf.
ndb/tools/ndb_config.cpp:
  Change help info from Ndb.cfg to my.cnf

ndb/src/mgmclient/CommandInterpreter.cpp:
  add right braces

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19198

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530


ndb/src/mgmclient/CommandInterpreter.cpp:
  Many methods add the return value that indicates whether the execution of operation succeeds.
  This can make ndb_mgm management client set the exit status on errors.

  Fix so that scans closed before execute are removed from "scans to send list"


ndb/include/ndbapi/NdbTransaction.hpp:
  Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix so that scans closed before execute are removed from "scans to send list"
ndb/src/ndbapi/NdbTransaction.cpp:
  Fix so that scans closed before execute are removed from "scans to send list"

          almost useless for any kind of shell script automation.
          Now add the return value that indicates the execution whether or not success 
          for many methods.


ndb/src/mgmclient/CommandInterpreter.cpp:
  Many methods add the return value that indicates whether the execution of operatioin succeeds.
  This can make ndb_mgm management client set the exit status on errors.

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  Fix for alter table when node is down...that could cause pain and misery


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Make sure to check table version before retriving from disk

  review, Fix also master being "old" version


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix also master being "old" version

  remove accidently left debug code


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove accidently left debug code

  send new fragdistkeys to all replicas during node recovery
  to make sure that not 3rd or 4th replicas fragDistKey becomes out of sync


ndb/include/kernel/GlobalSignalNumbers.h:
  new signal UpdateFragDistKeyOrd
ndb/include/kernel/signaldata/CopyFrag.hpp:
  new signal UpdateFragDistKeyOrd
ndb/include/ndb_version.h.in:
  online software upgrade for new signal UpdateFragDistKeyOrd
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send noew list of all replicas in copyfragreq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  new signal UpdateFragDistKeyOrd
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new signal UpdateFragDistKeyOrd

ndb/src/ndbapi/NdbScanOperation.cpp:
  set error code to 4008 when a scan time out

BUG#19787 Modify correct message when some important variables are changed but cannot be applied by online


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Modify error message when illegal configuration changed.

  also bind client to local host name if specified


ndb/src/common/transporter/Transporter.cpp:
  Add binding also of transporter connection (to hostname specified in config file)