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

into mysql.com:/home/mydev/mysql-5.0-wl2126


include/my_base.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

Added the required structures and functions for
handing over multiple key ranges to the table handler.


include/my_base.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from sql/opt_range.h to here.
  Added the multi-range structure.
sql/handler.cc:
  WL#2126 - Multi_read_range.
  Added the new table handler methods.
sql/handler.h:
  WL#2126 - Multi_read_range.
  Added a new table flag.
  Added a declaration for the handler buffer.
  Added new elements to class handler.
  Added new function declarations.
sql/mysqld.cc:
  WL#2126 - Multi_read_range.
  Added an option to set new system variable 'multi_range_count'.
sql/opt_range.cc:
  WL#2126 - Multi_read_range.
  Added initialization for the new class members.
  Added initialization for the extended get_next().
  Added de-initialization for the allocated buffers.
  Added a buffer allocation method.
  Added an inner loop to collect multiple ranges.
  Adapted range collection loops to the new initialization.
sql/opt_range.h:
  WL#2126 - Multi_read_range.
  Moved key range flags from here to include/my_base.h.
  Added new elements to class QUICK_RANGE_SELECT.
  Added a copy constructor.
sql/records.cc:
  WL#2126 - Multi_read_range.
  Added a call of the allocation method.
sql/set_var.cc:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.
sql/sql_class.h:
  WL#2126 - Multi_read_range.
  Added the new system variable 'multi_range_count'.

Changed my_error() to print error messages, which come from
arbitrary registered ranges of error messages. Messages can
be unregistered (and should be at end of the program).
Added registration of handler error messages.
Added a new mi_print_error() macro and a new 
mi_report_error() function, which supply error
messages with a table name.
Added calls to mi_print_error() or mi_report_error()
at all places in MyISAM, where table corruption is detected.


extra/comp_err.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added prints for ER_ERROR_FIRST and ER_ERROR_LAST.
  Removed print for ER_ERROR_MESSAGES.
include/errmsg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added declaration for a new function.
  Added first and last error number defines.
include/my_base.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added first and last error number defines.
include/my_sys.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed obsolete defines.
  Removed a global variable, which held pointers to the error message arrays.
  Added declarations for new functions.
include/mysys_err.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Removed an obsolete define.
  Changed two defines to use the new defines.
  Added first and last error number defines.
libmysql/errmsg.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Replaced global array initialization by proper registration
  and unregistration of client error messages.
libmysql/libmysql.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added a call for unregistration of client error messages.
myisam/mi_delete.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
  Added a debugging call to test undefined error numbers in case a special
  debug string is set.
myisam/mi_extra.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_info.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the error logging function.
myisam/mi_key.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_keycache.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_locking.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_open.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_page.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_range.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_rkey.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_search.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
myisam/mi_update.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/mi_write.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added calls to the new error logging function at all places, where
  corruption is detected.
  Added a debugging call to pretend MyISAM corruption in case a special
  debug string is set.
myisam/myisamdef.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added the declaration of the new error logging function
  and a new macro.
mysql-test/r/merge.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/r/repair.result:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed test results. These come from the changed error reporting
  in openfrm().
mysql-test/t/merge.test:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changederror numbers. These come from the changed error reporting
  in openfrm().
mysys/errors.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Dropped the assignment of the global errors to the
  dropped global pointer array.
mysys/my_error.c:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed my_error() from using a static array of pointers to
  error message arrays to using a linked list of structures
  with pointers to array message arrays.
  Added functions for registering and unregistering error 
  message arrays to the chain.
sql/derror.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed reading of mysqld error messages to using the new
  registering and unregistering functions.
sql/handler.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Added initialization and deinitialization of handler error messages.
  Included more handler error messages in the mapping to
  mysqld error messages.
sql/mysqld.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed deinitialization of error messages to proper
  unregistration.
sql/table.cc:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed error reporting in openfrm() so that error messages from
  handler::ha_open() are reported by handler::print_error(). This
  changed messages from "Can't open 't1.MYI' (errno: 130)" to
  "Incorrect file format 't1'" for example.
sql/unireg.h:
  WL#1895 - Print message to error log in case of detected MyISAM corruption
  Changed two defines to use the new defines.

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

into build.mysql.com:/users/tulin/mysql-5.0-ndb

   updated naming
Makefile.am:
  updated naming


ndb/docs/Makefile.am:
  updated naming
ndb/docs/doxygen/predoxy.pl:
   updated naming

  changed some doxygen flags


ndb/docs/doxygen/Doxyfile.ndb:
  changed some doxygen flags

to make pdf do "make all-pdf"