ndb/src/mgmsrv/ConfigInfo.cpp:
  The high bound of MaxNoOfTables changes into MAX_TABLES defined in ndb_limits.h

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715


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

ndb/src/mgmclient/CommandInterpreter.cpp:
  Adding the judgement for node type to distinguish the data nodes and non-data nodes. 
  From the return value. Management client can't distinguish the really not connected status for data nodes and status of non-data nodes.
  We can get the connect status about non-data nodes from version, if the version is 0, it means no connected status.

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.

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.

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

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  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.

          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.

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.

Data node is not allowed to get added in the cluster when it is in single user mode.


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/mgmapi/ndbd_exit_codes.h:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/include/ndb_version.h.in:
  added version macro for version 5.0.25.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Data node is not allowed to get added in the cluster when it is in single user mode.
ndb/src/kernel/error/ndbd_exit_codes.c:
  Data node is not allowed to get added in the cluster when it is in single user mode.

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

ndb/include/mgmapi/mgmapi.h:
  add one function
ndb/src/mgmapi/mgmapi.cpp:
  add one function to get cluster loglevel
ndb/src/mgmsrv/Services.cpp:
  addn one function to deal with get log level
ndb/src/mgmsrv/Services.hpp:
  add getClusterLogLevel() function define

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


ndb/include/util/File.hpp:
  Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged

Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.

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

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


BitKeeper/deleted/.del-bug20328.result~4fee68989442c2a3:
  Auto merged
BitKeeper/deleted/.del-bug20328.test~c76d766fe3e1eb5:
  Auto merged
myisam/mi_unique.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

ndb/src/mgmclient/CommandInterpreter.cpp:
  connect() function adds a parameter in CommandInterpreter.cpp.

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


ndb/src/mgmclient/CommandInterpreter.cpp:
  ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
  and this commit fixes probable mem leak

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


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

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


ndb/include/util/File.hpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged

Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.

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


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

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

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


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

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-20987