ndb/test/ndbapi/testPartitioning.cpp:
  Update test partitioning to add primary keys (distribution keys)
    incase of either 
  - only 1 primary key
  - primary keys with charsets
ndb/test/src/HugoCalculator.cpp:
  Fix so that Hugo can cope with pk's in the "end" of the table

ndb/test/include/HugoOperations.hpp:
  Fix pkRead on ordered index
ndb/test/ndbapi/testPartitioning.cpp:
  Update test prg to handled ordered indexes aswell
ndb/test/src/HugoOperations.cpp:
  Fix pkRead on ordered index
ndb/test/src/HugoTransactions.cpp:
  Fix pkRead on ordered index

ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fix typo

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix setting of dist keys for ordered indexes
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Remove support for combined distribution key and range scan
sql/ha_ndbcluster.cc:
  Merge error with wl2126

sql/ha_ndbcluster.cc:
  #ifdef on key_multi_range
sql/ha_ndbcluster.h:
  Use forward declarations for key_multi_range

ndb/include/kernel/AttributeHeader.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/include/HugoOperations.hpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/HugoOperations.cpp:
  Auto merged
ndb/test/src/HugoTransactions.cpp:
  Auto merged
ndb/test/src/UtilTransactions.cpp:
  Auto merged
ndb/tools/select_count.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionary.cpp:
  SCCS merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Set distribution key for ordered indexes
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Allow create_index_object to modify index_table
ndb/tools/restore/consumer_restore.cpp:
  Allow create_index_object to modify index_table

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

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

ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout of SCAN_TABREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set correct status on scanfrag record
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix setting of distribution key wrt scan
ndb/tools/select_count.cpp:
  Fix select_count

     +more code reuse
     +easier testing of indexes


ndb/include/ndbapi/NdbDictionary.hpp:
  Remove unimplemented enums
ndb/test/include/HugoOperations.hpp:
  Pass index on constructor
ndb/test/include/HugoTransactions.hpp:
  Pass index on constructor
ndb/test/include/UtilTransactions.hpp:
  Pass index on constructor
ndb/test/src/HugoAsynchTransactions.cpp:
  Pass index on constructor
ndb/test/src/HugoOperations.cpp:
  Use getOperation to select operation type
ndb/test/src/HugoTransactions.cpp:
  Use HugoOpertaions to run transactions
ndb/test/src/UtilTransactions.cpp:
  Use HugoOpertaions to run transactions

  fix scan take over


ndb/include/kernel/AttributeDescriptor.hpp:
  remove deprecated bits
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/kernel/vm/MetaData.hpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  removed deprecated parameters
  moved never implemented to Unimplemented
ndb/src/ndbapi/NdbScanOperation.cpp:
  Do scan take over via distribution key code

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

ndb/src/mgmsrv/ConfigInfo.cpp:
  Handle connections without corresponding node

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

ndb/include/transporter/TransporterRegistry.hpp:
  fix protection

ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

ndb/docs/wl2077.txt:
  Add result from micro benchmark with shm-transporter
ndb/include/transporter/TransporterRegistry.hpp:
  Move pid into transporter registry
ndb/src/common/transporter/SHM_Transporter.cpp:
  Move pid into transporter registry
ndb/src/common/transporter/TransporterRegistry.cpp:
  Move pid into transporter registry
ndb/src/kernel/main.cpp:
  Move pid into transporter registry
ndb/src/ndbapi/TransporterFacade.cpp:
  Move pid into transporter registry

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

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


ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

      handled mixed tcp/shm transporters
+ bug#7124


ndb/src/common/transporter/SHM_Transporter.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/SHM_Transporter.hpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/common/transporter/TransporterRegistry.cpp:
  Add remote/own pid for signaling availability of data on shm-segment
ndb/src/kernel/main.cpp:
  Set pid to use for shm-signaling
ndb/src/mgmsrv/ConfigInfo.cpp:
  bug#7124
ndb/src/ndbapi/TransporterFacade.cpp:
  Set pid to use for shm-signaling

ndb/test/ndbapi/Makefile.am:
  foo

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

ndb/test/src/HugoTransactions.cpp:
  Fix memory leak in HugoLoad

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

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

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

server-tools/instance-manager/buffer.cc:
  fix typo
server-tools/instance-manager/commands.cc:
  get rid of compiler warnings
server-tools/instance-manager/guardian.cc:
  fix compiler warning
server-tools/instance-manager/instance.cc:
  fix warnings
server-tools/instance-manager/instance_map.cc:
  fix return value
server-tools/instance-manager/instance_map.h:
  fix problem, caused autobuild failure. Looks like a gcc problem - 
  "friend class <name>" doesn't work if specified before enclosed class
  <name> (this is not present in newer gcc versions)

Added comments (from code review on pull)


mysql-test/r/heap.result:
  Fix results that may change from run to run
mysql-test/r/ps_5merge.result:
  Fix wrong result
mysql-test/t/heap.test:
  Make results predictable
sql/sql_show.cc:
  Add comments
  Fixed typo

ndb/include/kernel/AttributeDescriptor.hpp:
  wl-1732 support all charsets
ndb/include/kernel/ndb_limits.h:
  wl-1732 support all charsets
ndb/include/kernel/signaldata/TuxBound.hpp:
  wl-1732 support all charsets
ndb/include/util/NdbSqlUtil.hpp:
  wl-1732 support all charsets
ndb/src/common/util/NdbSqlUtil.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  wl-1732 support all charsets
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationDefine.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbOperationSearch.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/NdbScanOperation.cpp:
  wl-1732 support all charsets
ndb/src/ndbapi/ndberror.c:
  wl-1732 support all charsets
ndb/test/ndbapi/Makefile.am:
  wl-1732 support all charsets
ndb/test/ndbapi/testOIBasic.cpp:
  wl-1732 support all charsets
ndb/tools/desc.cpp:
  wl-1732 support all charsets

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

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

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

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

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.n

ndb/include/kernel/ndb_limits.h:
  #define for max null bits
ndb/include/kernel/signaldata/TupFrag.hpp:
  Error code for too many nullbits
ndb/include/util/Bitmask.hpp:
  Cosmetic fix
ndb/src/common/util/Bitmask.cpp:
  handle (pos % 32) == 0
  more unit tests
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Check bitmask overflow
ndb/src/ndbapi/ndberror.c:
  New error code
ndb/test/ndbapi/testBitfield.cpp:
  Update test program
ndb/test/run-test/daily-basic-tests.txt:
  Add testBitfield to autotest

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