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)

  allow bind address for ndbd


ndb/include/mgmapi/mgmapi.h:
  Add support for setting local address in NdbMgmHandle
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Add support for specifying local bindaddress to ConfigRetreiver
ndb/include/util/SocketClient.hpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/common/util/SocketClient.cpp:
  Add support for setting local address in NdbMgmHandle
ndb/src/kernel/vm/Configuration.cpp:
  Add support for specifying local bindaddress to ndbd
ndb/src/mgmapi/mgmapi.cpp:
  Add support for setting local address in NdbMgmHandle

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


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge

  fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock

  Improve error message when detecting corrupted REDO log


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Improve error message when detecting corrupted REDO log

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


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings

  init ndb_cache_check_time and honor value in my.cnf


sql/ha_ndbcluster.cc:
  init ndb_cache_check_time and honor value in my.cnf

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


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

  Make sure updateNodeInfo is run on master also for temporary tables


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run update nodeinfo also here to handle
    temprorary tables in some situations
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  new error insert
ndb/test/ndbapi/testSystemRestart.cpp:
  test case

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


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true

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


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge

  Fix error message on copyfragref


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix error message

  add missing function to mgmapi


ndb/src/mgmapi/ndb_logevent.cpp:
  add missing function

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


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged

  Fix docs for NdbOpertation::sub_reg


ndb/include/ndbapi/NdbOperation.hpp:
  Fix docs for sub_reg

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


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged

   Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
     Yeilding crash on following dml on tupel



ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
        Yeilding crash on following dml on tupe

  merge 4.1->5.0 (variable rename)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge #21384 4.1->5.0
    variable rename

  Correction of bug#19852 (that also revealed another bug)
  Do grow noOfPagesToGrow with more than was actually allocated


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Dont grow "noOfPagesToGrow" with more than was actually allocated
    (as it will then grow indefinitly)

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

  Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
  add if-statement for firtListToCheck == 0

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

  Make possible to build both debug/release from compile-ndb-autotest


BUILD/compile-ndb-autotest:
  Make possible to build both debug/release from compile-ndb-autotest

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

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

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge

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


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

ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix printout

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  handle error in TCKEYREQ during TCINDXREQ better


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add 3 values to isIndexOp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle error in TCKEYREQ during TCINDXREQ
ndb/test/ndbapi/testIndex.cpp:
  Add testcase
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase

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

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


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

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

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

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge