storage/ndb/src/common/debugger/EventLogger.cpp:
  Add correct error string

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  add err message when error occur

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19352


storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged

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


ndb/src/kernel/vm/SimulatedBlock.cpp:
  Change the function name different in 5.0 and 4.1.

ndb/src/kernel/vm/SimulatedBlock.cpp:
  Return exact error message when parameters overflow in 32-bit platform.

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052

into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052


storage/ndb/include/ndbapi/ndberror.h:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

ndb/include/ndbapi/ndberror.h:
  Change unsigned int to int
ndb/src/mgmsrv/Services.cpp:
  Modify the overflow error existed in last patch. Change ther length of m_text to 512.
ndb/src/ndbapi/ndberror.c:
  Change the parameter of ndb_error_string from unsinged int to int.

Hide cluster.schema table when executing 'show tables' on mysql client.


sql/ha_ndbcluster.cc:
  Hide cluster.schema table to user.

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21858

storage/ndb/src/common/util/File.cpp:
  Avoid memory leak when EINTR error returns. Even though a close error happens, a ERROR message in out-file is given, and this shouldn't affect the normally running.

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug14612

into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug22547

added check in ndb_mgmd so that the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max Uint32 number.


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max value of Uint32.

BUG #22547 LongMessageBuffer too large causes ndbd to exit and gives the exact paramter name in error log.


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add a parameter id parameter for setSize method. When allocating memory error results in ndbd exit can gives exact parameter name in error log.

BUG #14612 If a restore is done on a slave cluster, yet the apply_status and schema tables don't exist,
           ndb_restore tool should create them.


storage/ndb/tools/restore/consumer.hpp:
  Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.cpp:
  Implement to create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.hpp:
  Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/restore_main.cpp:
  if apply_status and schema system tables don't exist, create them also.

correct segment fault in setSize(), 
and improve the error message with displaying the specific parameter's name if malloc fail


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add an argument refer to the ID of a parameter which will be malloced
storage/ndb/src/kernel/vm/ArrayPool.hpp:
  in setSize(), correct the segment default due to overflow of two 32-bit interger's multiply

storage/ndb/include/mgmapi/mgmapi.h:
  add a new function declaration
storage/ndb/src/mgmapi/Makefile.am:
  add a link of a new file ParamInfo.cpp which locate in mgmsrv dir
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
  add a new mgmapi function ndb_mgm_get_db_parameter_info
storage/ndb/src/mgmsrv/ParamInfo.cpp:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.cpp''
  initialization information of all parameters, this copy from mgmsrv/ConfigInfo.cpp
storage/ndb/src/mgmsrv/ParamInfo.hpp:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.hpp''

ndb - fixed for BUG#15021, binlog_index table become inconsistent if errors during purge of binlogs.
if EMFILE error occured while purging binary logs, stop purging logs and report error message to user.


mysys/my_open.c:
  report EMFILE error when opening file failed.
sql/log.cc:
  report EMFILE error when purging logs, and stop purging logs when EMFILE error occured.
sql/log.h:
  added LOG_INFO_EMFILE error number.
sql/share/errmsg.txt:
  added EMFILE error message for purging binary logs.
sql/sql_repl.cc:
  added EMFILE error message.
sql/table.cc:
  report EMFILE error.

into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj

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


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

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


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

  note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1


ndb/src/ndbapi/NdbScanOperation.cpp:
  missing if for bug#21941

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge

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


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  merge

  Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd
  Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self"


ndb/src/kernel/blocks/ERROR_codes.txt:
  Add error insert for dealying of copy sysfileData
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  1) Add error insert for delaying of sysfileData
  2) Change to that master is _not_ copying sysfileData from COPY_GCIREQ
     as it might be updating it while COPY_GCIREQ is "in the fly"

fixed for BUG#21519, 'MySQLD Err msg "Management server closed connection" needs date & time stamp'.
added date & time stamp for the messages that will be printed to the mysqld message file.


storage/ndb/src/common/transporter/OSE_Receiver.cpp:
  added date & time stamp for the messages.
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  added date & time stamp for the messages.
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  added date & time stamp for the messages.

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb

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


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

  ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)


storage/ndb/tools/restore/restore_main.cpp:
  Return OK even if temporary errors

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


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  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/csv/ha_tina.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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

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


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged

  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  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  merge: manual
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  SCCS merged

ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  fixes to move scan when entry removed: 1. do not check visibility to transaction 2. keep Blocked if moved to another version of same tuple 3. general improvements (remove m_match etc)

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446


storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  SCCS merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  merge: ur
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

ndb/test/ndbapi/testOIBasic.cpp:
  test -case h for parallel ordered update (bug#20446)
ndb/test/run-test/daily-basic-tests.txt:
  test -case h for parallel ordered update (bug#20446)
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove stupid Data abstraction which is not completely transparent
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  remove stupid Data abstraction which is not completely transparent
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  remove stupid Data abstraction which is not completely transparent