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

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

ndb/test/ndbapi/testBackup.cpp:
  More old constructs

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

ndb/test/include/NDBT_Test.hpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/Bank.hpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankCreator.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankMakeGL.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTimer.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/bank/testBank.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/create_all_tabs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/create_tab.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/drop_all_tabs.cpp:
  Update to use new Ndb constructor
ndb/test/ndbapi/flexBench.cpp:
  Update to use new Ndb constructor
ndb/test/src/NDBT_Test.cpp:
  Update to use new Ndb constructor
ndb/test/tools/copy_tab.cpp:
  Update to use new Ndb constructor
ndb/test/tools/create_index.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoFill.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoLoad.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoLockRecords.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkDelete.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkRead.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkReadRecord.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoPkUpdate.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoScanRead.cpp:
  Update to use new Ndb constructor
ndb/test/tools/hugoScanUpdate.cpp:
  Update to use new Ndb constructor
ndb/test/tools/verify_index.cpp:
  Update to use new Ndb constructor

and ndbapi.hpp as they look like crap when converted 
to PDF.


ndb/include/mgmapi/mgmapi.h:
  Got rid of <code> tags in doxycomments.
ndb/include/ndbapi/Ndb.hpp:
  Got rid of <code> tags in doxycomments.

align class members = no (get rid of crufty HTML 
tables that don't translate well into PDF)
tab = 2 (8 is too wide)
show used = no (most of these are suppressed header 
files, hence not linked, hence not useful)
disable index = yes (saves stripping these out in 
combination script)


ndb/docs/doxygen/Doxyfile.mgmapi:
  align class members = no
  tab = 2
  show used = no
  disable index = yes
ndb/docs/doxygen/Doxyfile.ndbapi:
  align class members = no
  tab = 2
  show used = no
  disable index = yes
ndb/docs/doxygen/Doxyfile.ndb:
  align class members = no
  tab = 2
  disable index = yes
ndb/docs/doxygen/Doxyfile.odbc:
  align class members = no
  tab = 2
  show used = no
  disable index = yes
ndb/docs/doxygen/Doxyfile.test:
  align class members = no
  tab = 2
  show used = no
  disable index = yes

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

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

ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  removed debug printout

ndb/include/ndbapi/NdbScanFilter.hpp:
  Rename condition to prevent #define name clashes
ndb/src/ndbapi/NdbScanFilter.cpp:
  Rename condition to prevent #define name clashes
sql/ha_ndbcluster.cc:
  Update ha_ndbcluster to new NdbScanFilter interface

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

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

ndb/include/ndbapi/NdbOperation.hpp:
  change char* -> void*
ndb/include/ndbapi/NdbScanFilter.hpp:
  Add generic cmp-function
  Let "old" function use the new one
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add support for all types for scan filters
ndb/src/ndbapi/NdbOperationInt.cpp:
  Check length of argument
ndb/src/ndbapi/NdbScanFilter.cpp:
  Add support for all types for scan filters

ndb/test/tools/hugoScanRead.cpp:
  fix test tools

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


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

  (hopefully last :-))


ndb/include/ndbapi/NdbDictionary.hpp:
  remove unimplemented types
ndb/include/ndbapi/NdbReceiver.hpp:
  return pointer to row for simplified handling of current row features
ndb/include/ndbapi/NdbScanOperation.hpp:
  return pointer to row for simplified handling of current row features
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  remove unimplemented types
ndb/src/ndbapi/NdbIndexOperation.cpp:
  remove unimplemented types
ndb/src/ndbapi/NdbReceiver.cpp:
  return pointer to row for simplified handling of current row features
ndb/src/ndbapi/NdbScanOperation.cpp:
  return pointer to row for simplified handling of current row features
sql/ha_ndbcluster.cc:
  Impl. newest read_multi_range patch
sql/ha_ndbcluster.h:
  Impl. newest read_multi_range patch
sql/opt_range.cc:
  Add 1 to compensate for incorrect row estimate of 0

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

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


server-tools/instance-manager/Makefile.am:
  Auto merged

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

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

ndb/include/ndbapi/Ndb.hpp:
  Update documentation wrt scans
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Update documentation wrt scans
ndb/include/ndbapi/NdbOperation.hpp:
  Update documentation wrt scans
ndb/include/ndbapi/NdbRecAttr.hpp:
  Update documentation wrt scans
ndb/include/ndbapi/NdbScanOperation.hpp:
  Update documentation wrt scans
ndb/include/ndbapi/NdbTransaction.hpp:
  Update documentation wrt scans
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Update documentation wrt scans

ndb/src/common/util/NdbSqlUtil.cpp:
  allow Datetime as pk or index key.  XXX ordering is wrong before wl-1442 done

innobase/btr/btr0btr.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/btr/btr0cur.c:
  Remove parameter n_fields from cmp_rec_rec_with_match()
innobase/btr/btr0pcur.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/include/rem0cmp.h:
  Remove parameter n from cmp_rec_rec_with_match() and cmp_rec_rec()
innobase/include/rem0cmp.ic:
  Remove parameter n from cmp_rec_rec()
innobase/include/rem0rec.ic:
  Correct the implementation of rec_offs_nth_size() (Bug #7493)
innobase/page/page0page.c:
  Remove parameter n_fields from cmp_rec_rec()
innobase/rem/rem0cmp.c:
  Remove parameter n from cmp_rec_rec_with_match()
innobase/rem/rem0rec.c:
  rec_get_offsets(): Pass the number of allocated elements to
  rec_offs_set_n_alloc() instead of the number of allocated bytes,
  so that debugging assertions are more likely to detect
  out-of-bounds errors.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

    test_d2b2d("123.4", 10, 2, "123.40");


strings/decimal.c:
  test_d2b2d("123.4", 10, 2, "123.40");

ndb/include/mgmapi/mgmapi.h:
  Minor fixes in Doxygen comments.
ndb/include/ndbapi/Ndb.hpp:
  Spelling/grammar/stylistic fixes in Doxygen comments.

ndb/include/mgmapi/mgmapi.h:
  Trying the HTML formatting commands for Doxygen again...

if this is causing the failure with perl and 
doxygen...


ndb/include/mgmapi/mgmapi.h:
  Removing HTML formatting to see 
  if this is causing the make failure...

ndb/include/mgmapi/mgmapi.h:
  Testing formatting commands for Doxygen.

Some grammar/spelling fixes in mgmapi.h; 
also some tests of formatting commands.


ndb/include/mgmapi/mgmapi.h:
  Some grammar/spelling fixes.
  
  Tests of some formatting commands.

into mysql.com:/M50/mysql-5.0

This is a partial solution for bug#7464.


innobase/include/rem0rec.ic:
  On several platforms, "inline functions" must be coded before being used, in "bottom-up" order.
  Ensure this for 'rec_get_status' and 'rec_offs_n_fields'.

ndb/include/Makefile.am:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/AttributeDescriptor.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_constants.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndb_types.h:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/ndbapi/NdbDictionary.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/include/util/NdbSqlUtil.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/kernel/vm/MetaData.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/Ndb.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup
ndb/src/ndbapi/NdbScanOperation.cpp:
  unify api/kernel types
  deprecate 2-bit AttributeType, use 5-bit AttributeExtType
  upgradable from 4.1 via nr/sr/backup

ndb/docs/Makefile.am:
  removed extra \'es
ndb/test/tools/Makefile.am:
  removed unused definition

ndb/src/common/transporter/Transporter.hpp:
  Add get_r_port()
ndb/src/common/transporter/TransporterRegistry.cpp:
  compile fix: use t->get_r_port()