into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged

into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb

don't include header files or class private members;
do include class static members.


ndb/docs/doxygen/Doxyfile.mgmapi:
  Disable inclusion of headers.
  Enable inclusion of static members.
ndb/docs/doxygen/Doxyfile.ndbapi:
  Disable inclusion of headers.
  Enable inclusion of static members.
ndb/docs/doxygen/Doxyfile.ndb:
  Disable inclusion of headers.
  Disable inclusion of private members.
ndb/docs/doxygen/Doxyfile.odbc:
  Disable inclusion of headers.
  Disable inclusion of private members.
ndb/docs/doxygen/Doxyfile.test:
  Disable inclusion of headers.
  Disable inclusion of private members.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ndb/test/run-test/daily-basic-tests.txt:
  Run testTransactions on table explicitly to avoid unhandled error

ndb/test/ndbapi/testNdbApi.cpp:
  testNdbApi -n UpdatesWithoutValues

ndb/test/src/HugoTransactions.cpp:
  Fix indexRead (range)

ndb/test/ndbapi/testIndex.cpp:
  Use stop and wait to capture error during restart
ndb/test/src/UtilTransactions.cpp:
  Add extra check for readRowFromIndex failure due to loosing of locks
   in scan

ndb/test/ndbapi/testDict.cpp:
  Drop table at end of testDict createTableWhenDbIsFull

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

into polly.local:/home/kaa/src/mysql-5.0


innobase/os/os0proc.c:
  Auto merged

into mysql.com:/space/pekka/ndb/version/my50-ndb

ndb/test/ndbapi/testOIBasic.cpp:
  test ordering, add hash indexes, fix result verification
mysql-test/ndb/ndb_range_bounds.pl:
  minor
mysql-test/r/ndb_index_ordered.result:
  minor
mysql-test/t/ndb_index_ordered.test:
  minor

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

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

ndb/test/run-test/daily-basic-tests.txt:
  Add partitioning tests to autotest

ndb/src/ndbapi/ClusterMgr.cpp:
  Update connect count if node_failrep reaches us before node disconnects

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

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

ndb/src/ndbapi/NdbConnection.cpp:
  Always return -1 on failures
ndb/src/ndbapi/Ndbif.cpp:
  Always return -1 on failures

into shark.:/space/ndbdev/clone-mysql-5.0-ndb-daily-2004-12-20

mysql-test/ndb/ndb_range_bounds.pl:
  test ordered scan
mysql-test/r/ndb_index_ordered.result:
  test ordered scan
mysql-test/t/ndb_index_ordered.test:
  test ordered scan
sql/ha_ndbcluster.cc:
  wl-1893: range scanning backwards, handler
sql/ha_ndbcluster.h:
  wl-1893: range scanning backwards, handler

into shark.:/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union

ndb/test/ndbapi/testNodeRestart.cpp:
  Fix testNodeRestart -n CommittedRead

  Delete: BUILD/compile-amd64-max


BitKeeper/deleted/.del-compile-amd64-max~55ce22d5200bf8da:
  Delete: BUILD/compile-amd64-max

  Delete: BUILD/compile-amd64-max


BitKeeper/deleted/.del-compile-amd64-max~f3b2b8c5aefbeacb:
  Delete: BUILD/compile-amd64-max

  Logging to logging@openlogging.org accepted
compile-amd64-max, compile-amd64-debug-max:
  new file


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix handling reading of more that MAX_MESSAGE_SIZE
ndb/src/ndbapi/Ndbif.cpp:
  Set theReturnStatus if failing before sending
ndb/test/ndbapi/testTimeout.cpp:
  remove invalid tests
ndb/test/run-test/daily-basic-tests.txt:
  remove invalid tests

ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.hpp:
  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
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/include/transporter/TransporterRegistry.hpp:
  Resolve merge conflict (change of parameter name)
ndb/src/common/transporter/TransporterRegistry.cpp:
  Resolve merge conflict (change of parameter name)

mysql-test/r/federated.result:
  Change mode to -rw-rw-r--
mysql-test/r/fulltext2.result:
  Change mode to -rw-rw-r--
mysql-test/r/grant2.result:
  Change mode to -rw-rw-r--
mysql-test/r/information_schema_inno.result:
  Change mode to -rw-rw-r--
mysql-test/r/innodb_handler.result:
  Change mode to -rw-rw-r--
mysql-test/r/insert_update.result:
  Change mode to -rw-rw-r--
mysql-test/r/repair.result:
  Change mode to -rw-rw-r--
mysql-test/r/rpl_create_database.result:
  Change mode to -rw-rw-r--
mysql-test/r/type_bit.result:
  Change mode to -rw-rw-r--

into mysql.com:/home/my/mysql-5.0


innobase/os/os0proc.c:
  Auto merged

Fixed some found bugs in BIT fields
Added more test cases for BIT fields and varchar


include/my_base.h:
  Merge
  Added HA_BIT_PART for easier test in key.cc
innobase/os/os0proc.c:
  Fixed typo
myisam/mi_dbug.c:
  Add printing of BIT types when debugging
mysql-test/r/show_check.result:
  Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
mysql-test/r/type_bit.result:
  More tests
mysql-test/r/type_varchar.result:
  More tests
mysql-test/t/show_check.test:
  Set 'Avg_row_length' to # as this value is different between 32 and 64 bit machines
mysql-test/t/type_bit.test:
  More tests
mysql-test/t/type_varchar.test:
  More tests
sql/field.cc:
  Added Field::val_int_as_str() to get better logging of bit fields
  Merged new_key_field with move_field() to fix some problems with bit fields
  Fixed some bugs with bit fields
sql/field.h:
  Added Field::val_int_as_str() to get better logging of bit fields
  Merged new_key_field with move_field() to fix some problems with bit fields
  Fixed some bugs with bit fields
sql/ha_myisam.cc:
  Fixed problem with unintialized memory (not critical)
sql/key.cc:
  Fix so that 'key_cmp_if_same' works with bit fields.
sql/opt_range.cc:
  Move declarations first in function
  Nice printing of bit fields in debug log
sql/sql_prepare.cc:
  Fixed old merge error (not critical)
sql/sql_select.cc:
  Use new interface to new_key_field
sql/sql_select.h:
  Use new interface to new_key_fields()
  This fixes a bug with BIT fields where the upper bit of the data was not stored in the key buffer
sql/structs.h:
  Extend key_part_flag to be able to add HA_BIT_PART to it
sql/table.cc:
  Mark BIT key parts with HA_BIT_PART to make test in key.cc simpler

into mysql.com:/home/dlenev/src/mysql-5.0

into polly.local:/home/kaa/src/mysql-5.0