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

    added some doxygen skip internal


ndb/include/ndbapi/Ndb.hpp:
  removed interpreted program stuff from docs
ndb/include/ndbapi/NdbOperation.hpp:
  added some doxygen skip internal

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

removed friend declarations from doxygen
updated some documentation in mgmapi


BitKeeper/deleted/.del-NdbCursorOperation.hpp~da121aeaf101b136:
  Delete: ndb/include/ndbapi/NdbCursorOperation.hpp
BitKeeper/deleted/.del-NdbCursorOperation.cpp~8d49480ced2deba5:
  Delete: ndb/src/ndbapi/NdbCursorOperation.cpp
ndb/include/Makefile.am:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/ScanTab.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcCommit.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcHbRep.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcIndx.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcKeyConf.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcKeyFailConf.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/kernel/signaldata/TransIdAI.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/mgmapi/mgmapi.h:
  backwards compatible name change NdbConnectionto NdbTransaction
  documented some missing things in mgmapi
ndb/include/ndbapi/Ndb.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbApi.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbBlob.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbDictionary.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbEventOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbIndexOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbRecAttr.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbReceiver.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbScanFilter.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbScanOperation.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/include/ndbapi/NdbTransaction.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Makefile.am:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndb.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbApiSignal.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbBlob.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbImpl.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbIndexOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationDefine.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationExec.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationInt.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbOperationSearch.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbReceiver.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbScanOperation.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbTransaction.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/NdbTransactionScan.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndberr.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndbif.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndbinit.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/src/ndbapi/Ndblist.cpp:
  backwards compatible name change NdbConnectionto NdbTransaction
ndb/tools/restore/consumer_restore.hpp:
  backwards compatible name change NdbConnectionto NdbTransaction
sql/ha_ndbcluster.h:
  backwards compatible name change NdbConnectionto NdbTransaction

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

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

ndb/test/run-test/daily-basic-tests.txt:
  change order between tests as flexXX don't clean up tables

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

ndb/test/run-test/daily-devel-tests.txt:
  run full mysql-test-run in autotest
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

ndb/include/kernel/signaldata/CreateTable.hpp:
  Check array size in dict before creating table
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Check array size in dict before creating table
ndb/src/ndbapi/ndberror.c:
  Check array size in dict before creating table

into mysql.com:/home/cps/mysql/trees/mysql-5.0

This fix icludes workaround for Irix compiler bug & removs some unused
variables (resulted in warnings)


server-tools/instance-manager/mysql_connection.cc:
  removed unused variable
server-tools/instance-manager/parse.cc:
  removed unused variable
server-tools/instance-manager/thread_registry.cc:
  Workaround for the Irix compiler bug
server-tools/instance-manager/user_map.cc:
  removed unused variable

  added compatability info
NdbTransaction.hpp:
  Rename: ndb/include/ndbapi/NdbConnection.hpp -> ndb/include/ndbapi/NdbTransaction.hpp


ndb/include/ndbapi/NdbTransaction.hpp:
  Rename: ndb/include/ndbapi/NdbConnection.hpp -> ndb/include/ndbapi/NdbTransaction.hpp
ndb/src/common/util/version.c:
  added compatability info

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

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

into hundin.mysql.fi:/home/jan/mysql-5.0

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

into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283

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


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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 gw.mysql.r18.ru:/usr/home/ram/work/5.0.b7283

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

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

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

sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged.

into mysql.com:/dbdata/psergey/mysql-5.0-nov-clean


sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged

so we read dependent tables after tables they depend on (this is needed for outer joins)


mysql-test/r/join_outer.result:
  Test for BUG#4480
mysql-test/t/join_outer.test:
  Test for BUG#4480

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


innobase/os/os0proc.c:
  Auto merged

client/mysqltest.c:
  A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)).
  Unused bind slots should be zeroed.

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