new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method


mysql-test/r/ndb_alter_table.result:
  correct record field in ndbcluster handler
mysql-test/r/ndb_blob.result:
  correct record field in ndbcluster handler
ndb/include/ndbapi/NdbDictionary.hpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/DictCache.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/DictCache.hpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
ndb/src/ndbapi/Ndb.cpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbDictionary.cpp:
  new method for ndbcluster handler to store/retrieve table and thread specific data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
  moved heavy global cache fetch from inline to separate method
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  replaced method DictionaryImpl::getTable with DictionaryImpl::get_local_table_info
ndb/src/ndbapi/NdbLinHash.hpp:
  changed deleteKey to return ponter to deleted object
sql/ha_ndbcluster.cc:
  moved all ndb thread specific data into new placeholder
  new methods to keep "records" up to date
  unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
sql/ha_ndbcluster.h:
  new methods to keep "records" up to date
sql/sql_class.h:
  moved all ndb thread specific data into new placeholder

  bumped up version to 3.5.1


configure.in:
  bumped up version to 3.5.1

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge


ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged

compile error/warning fixes
added force of heartbeat
added ability to force heartbeat


ndb/src/common/mgmcommon/LocalConfig.cpp:
  added possibility to use comma-separated connectstring
ndb/src/common/mgmcommon/NdbConfig.c:
  compile error/warning fixes
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added force of heartbeat
ndb/src/mgmsrv/main.cpp:
  changed help text
ndb/src/ndbapi/ClusterMgr.cpp:
  added ability to force heartbeat
ndb/src/ndbapi/Ndbinit.cpp:
  added comment

ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  SCCS merged

  removed shhor switch for nodaemon


ndb/src/mgmsrv/main.cpp:
  removed shhor switch for nodaemon

  Added ability to force heartbeat


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Added ability to force heartbeat

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

  fix test result.


mysql-test/r/mysql_protocols.result:
  fix test result.

into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

into poseidon.(none):/home/tomas/mysql-4.1-ndb

into poseidon.(none):/home/tomas/mysql-4.1-ndb

fixed some mutex locks for Ndb objects
moved TranspoterFacade::stop_instance to cluster connection
moved Socket Server::start_server outside the TransporterFacade::start_instance thread


ndb/include/mgmapi/mgmapi.h:
  improved show command
ndb/src/mgmapi/mgmapi.cpp:
  improved show command
ndb/src/mgmclient/CommandInterpreter.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.cpp:
  improved show command
ndb/src/mgmsrv/MgmtSrvr.hpp:
  improved show command
ndb/src/mgmsrv/Services.cpp:
  improved show command
ndb/src/ndbapi/Ndbinit.cpp:
  fixed some mutex locks for Ndb objects
  moved TranspoterFacade::stop_instance to cluster connection
ndb/src/ndbapi/TransporterFacade.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/TransporterFacade.hpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  movet Socket Server::start_server outside the TransporterFacade::start_instance thread

BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
  Delete: mysql-test/t/ctype_tis620-master.opt

ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged

into poseidon.(none):/home/tomas/mysql-4.1

put ByteOrder config param back as depricated


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  put ByteOrder config param back as depricated
ndb/src/mgmsrv/MgmtSrvr.cpp:
  better error printouts on cannot alloc node id

into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

into mysql.com:/home/wax/mysql/mysql-4.1group_concat


sql-common/client.c:
  Auto merged

into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-09-08

Fix autotest of backups
Fix autotest with mysql-test-run


ndb/test/run-test/atrt-testBackup:
  Rename: ndb/test/ndbapi/atrt-testBackup -> ndb/test/run-test/atrt-testBackup
ndb/test/run-test/Makefile.am:
  Install atrt wrappers
ndb/test/run-test/atrt-mysql-test-run:
  Take args from caller
ndb/test/run-test/daily-devel-tests.txt:
  Use wrapper to test backup
ndb/test/run-test/main.cpp:
  Add MYSQL_BASE_DIR to environment of test programs

  fix typos noticed while poking around in test program.


tests/client_test.c:
  fix typos noticed while poking around in test program.

ndb/src/kernel/blocks/backup/Backup.cpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/Backup.hpp:
  Save meta data for indexes (but not actual data)
ndb/src/kernel/blocks/backup/restore/consumer.hpp:
  Introduced endOfTables into Consumer interface
ndb/src/kernel/blocks/backup/restore/consumer_restore.cpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp:
  Store indexes and create then when endOfTables is called
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Run endOfTables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Split getIndexImpl into 2 methods
  (one being used by restore)

  Changed label on INFORMATION log items to NOTE


sql/log.cc:
  Changed label on INFORMATION log items to NOTE

Statements": 
- fix a couple of net->buff overruns in libmysql,
- check in the server that statement parameter count is less than
  65535 (maximum value supported by prepared statements protocol).
 


libmysql/libmysql.c:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - clean up my_realloc_str()
  - ensure that net buffer has space when storing null bits and
    parameter typecodes.
sql/net_serv.cc:
  - set net->last_errno if packet is too big, even on client
    (Why was it ifdefed before?)
sql/sql_prepare.cc:
  Bug#5194 "Bulk Insert Failures with Prepared Statements":
  - if placeholder count is bigger than 65535, give error.
    We have only 2 bytes reserved for transferring placeholder count
    in 4.1 protocol.
  - can't add a proper error code and message in 4.1 because of
    possible merge difficulties."
tests/client_test.c:
  A test case for Bug#5194 "Bulk Insert Failures with Prepared 
  Statements".

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into mysql.com:/dbdata/psergey/mysql-4.1-bug-grp

Don't evaluate the value of GROUP_CONCAT several times for the same 'group', reuse the value instead.


mysql-test/r/group_by.result:
   Testcase for bug#5400
mysql-test/t/group_by.test:
   Testcase for bug#5400

  Print sqlstate value in batch mode, not just in interactive mode.


client/mysql.cc:
  Print sqlstate value in batch mode, not just in interactive mode.

added retries to tryBind


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  removed unnecesary check in ConfigInfo
ndb/src/mgmsrv/main.cpp:
  added retries to tryBind

into poseidon.(none):/home/tomas/mysql-4.1

into poseidon.(none):/home/tomas/mysql-4.1

added sanity checks for config file
changed so that ndb_0 is replaced by ndb_pid#### in ndb files
added error_string for to some functions, alloc_node_id(), start()
added better error printout for failed alloc node id
better error printouts for failures when starting ndb_mgmd


ndb/include/mgmapi/mgmapi.h:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  added sanity checks for config file
ndb/src/common/mgmcommon/NdbConfig.c:
  changed so that ndb_0 is replaced by ndb_pid#### in ndb files
ndb/src/kernel/error/ErrorReporter.cpp:
  removed usage of tracefile early in startup (when it's normally filled with zeroes)
ndb/src/mgmapi/mgmapi.cpp:
  added method to retrieve mysqld, ndbd, and ndb_mgmd aliases for API,MGM and DB
ndb/src/mgmsrv/MgmtSrvr.cpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/MgmtSrvr.hpp:
  added error_string for to some functions, alloc_node_id(), start()
ndb/src/mgmsrv/Services.cpp:
  added better error printout for failed alloc node id
ndb/src/mgmsrv/main.cpp:
  better error printouts for failures when starting ndb_mgmd