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

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

  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"

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

  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)

as suggested by Jonas (still Bug #17582)

as any other ndb tool in the distribution (Bug #22295)

mysql-test/r/ndb_config.result:
  test case for Bug #17582
mysql-test/t/ndb_config.test:
  test case for Bug #17582
ndb/tools/ndb_config.cpp:
  gethostname() returns a pointer to a static buffer so we 
  need to create a copy of the results before calling it on
  the 2nd host name, else we're effectively comparing a 
  hostname to itself which is of course always true
  (Bug #17582)

into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-ndb

  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/mysql-5.0-ndb

ndb/src/cw/cpcd/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/kernel/vm/Configuration.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/mgmclient/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/src/mgmsrv/main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/delete_all.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/desc.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/drop_index.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/drop_tab.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/listTables.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/ndb_config.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/restore/restore_main.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/select_all.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/select_count.cpp:
  added print_defaults() calls to --help output for all binaries
ndb/tools/waiter.cpp:
  added print_defaults() calls to --help output for all binaries

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


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

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

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_select.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Fix problem where mysql-test-run.pl fails to start up the mysqld after a failed test. Shows up on win hosts where one failed test case make subsequent ones fails with error "Could not open connection 'default': 2003 Can't connect to MySQL server on 'localhost'" 


mysql-test/lib/mtr_process.pl:
  Reset the associated "pid" of masters and slave when building the list of processes to shutdown.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  maint1.mysql.com:/data/localhome/tnurnberg/my50-21913


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged

into  salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913

21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.

Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)


mysql-test/r/func_time.result:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Prove DATE_FORMAT() no longer crashes the server when character_set_results is
  NULL (which is a legal value and means, "no conversion").
mysql-test/t/func_time.test:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Prove DATE_FORMAT() no longer crashes the server when character_set_results is
  NULL (which is a legal value and means, "no conversion").
sql/sql_string.cc:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
  because it is magic for, "no conversion."

Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)


mysql-test/r/func_time.result:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Prove DATE_FORMAT() no longer crashes the server when character_set_results is
  NULL (which is a legal value and means, "no conversion").
mysql-test/t/func_time.test:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Prove DATE_FORMAT() no longer crashes the server when character_set_results is
  NULL (which is a legal value and means, "no conversion").
sql/sql_string.cc:
  Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.
  
  Avoid NULL deref in my_charset_same() -- if !to_cs, we won't need to compare
  because it is magic for, "no conversion."

into  maint1.mysql.com:/data/localhome/tsmith/bk/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake

into  maint2.mysql.com:/data/localhome/tsmith/bk/50

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake

into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint