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

restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.


client/mysqldump.c:
  fix query to make dump restorable

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


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

into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb


client/mysqltest.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge.
storage/innobase/btr/btr0btr.c:
  SCCS merged
storage/innobase/buf/buf0buf.c:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
storage/innobase/fil/fil0fil.c:
  SCCS merged
storage/innobase/fsp/fsp0fsp.c:
  SCCS merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged
storage/innobase/include/btr0cur.ic:
  use local
storage/innobase/include/buf0buf.ic:
  SCCS merged
storage/innobase/log/log0log.c:
  SCCS merged
storage/innobase/log/log0recv.c:
  SCCS merged
storage/innobase/os/os0file.c:
  SCCS merged
storage/innobase/row/row0mysql.c:
  SCCS merged
storage/innobase/row/row0sel.c:
  SCCS merged
storage/innobase/srv/srv0start.c:
  SCCS merged
storage/innobase/ut/ut0dbg.c:
  SCCS merged

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


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  SCCS merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  merge

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809

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


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer.hpp:
  merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.cpp:
  merged for push bug#19651
storage/ndb/tools/restore/consumer_restore.hpp:
  merged for push bug#19651
storage/ndb/tools/restore/restore_main.cpp:
  merged for push bug#19651

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.1-new-ndb


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

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.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

storage/ndb/include/ndbapi/NdbDictionary.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/test/include/NDBT_Table.hpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)
storage/ndb/test/src/NDBT_Tables.cpp:
  compute aggregates only before create table or by user request.
  remove distribution key hacks (set by user/set by us..)

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge

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.1/mysql-5.1-bug21585

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.


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

          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.1/mysql-5.1-bug20575


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

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


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

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809

into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj


storage/ndb/src/ndbapi/NdbOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  change error message to more appropriate

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

bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated reslt file


mysql-test/r/rpl_ndb_dd_advance.result:
  bug#20073 information_schema.FILES for UNDO LOG give incorrect EXTENT_SIZE, FREE_EXTENTS,: Updated result file

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

Bug#18976  CRBR: multiple binlog, second binlog may miss schema log events:Change test back to verify again

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

storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  manual modify variable name.

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  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20809


client/mysqldump.c:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20073

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