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


sql/ha_ndbcluster.cc:
  Auto merged

mysql-test/r/ndb_index_ordered.result:
  test case
mysql-test/t/ndb_index_ordered.test:
  test case
ndb/include/kernel/signaldata/ScanTab.hpp:
  Split exclusive/keyinfo
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Add possibility retreive sorted flag
ndb/include/ndbapi/NdbOperation.hpp:
  Add possibility retreive lock mode
ndb/include/ndbapi/NdbResultSet.hpp:
  Add possibility to get operation
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Split exclusive/keyinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Store flags in ScanFragReq::requestInfo format
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Keep theLockMode up-to-date
ndb/src/ndbapi/NdbScanOperation.cpp:
  Keep theLockMode up-to-date
sql/ha_ndbcluster.cc:
  Use NdbIndexScanOperation::reset_bounds when
    performing second index access

ndb/include/ndbapi/NdbConnection.hpp:
  Add support for removing op from list
ndb/include/ndbapi/NdbScanOperation.hpp:
  virtual destructor
ndb/src/ndbapi/NdbConnection.cpp:
  Add support for removing op from list
ndb/src/ndbapi/NdbScanOperation.cpp:
  Set magic number to invalid before first prepareSendScan
  (so that prepareSendScan is only called once incase of restarts)
ndb/src/ndbapi/Ndblist.cpp:
  Use correct type
ndb/test/src/UtilTransactions.cpp:
  Update test prg.
  - use LM_Read to maintain locks
  - set iop = null on temporary error (restart transaction)

removed staus flag

  Fix compiler warning


innobase/lock/lock0lock.c:
  Fix compiler warning

into mysql.com:/home/dlenev/src/mysql-4.1-ryan

into mysql.com:/M41/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-ryan

ndb/test/include/NDBT_ResultRow.hpp:
  Completely new verifyOrderedIndex
     which utilies new wl2135 functionality
  + more utility functions
ndb/test/include/UtilTransactions.hpp:
  Completely new verifyOrderedIndex
     which utilies new wl2135 functionality
  + more utility functions
ndb/test/src/NDBT_ResultRow.cpp:
  Completely new verifyOrderedIndex
     which utilies new wl2135 functionality
  + more utility functions
ndb/test/src/UtilTransactions.cpp:
  Completely new verifyOrderedIndex
     which utilies new wl2135 functionality
  + more utility functions

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

into mysql.com:/home/dlenev/src/mysql-4.1-ryan

treated as DEFAULT NULL columns (independently from their position in
table).

(still to be discussed with Monty, Brian, Trudy et al. before push)


mysql-test/r/type_timestamp.result:
  Update test after making TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns 
  (independently from their position in table).
mysql-test/t/type_timestamp.test:
  Update test after making TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns 
  (independently from their position in table).
sql/sql_parse.cc:
  add_field_to_list(): made TIMESTAMP NULL columns without explicit 
  DEFAULT value to be always treated as DEFAULT NULL columns (independently
  from their position in table). This also simplifies code a bit.

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged

sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

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

bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
added testcase for this
use force send for all executes


mysql-test/r/ndb_blob.result:
  added testcase for alter table of blob from ndb to myisam
mysql-test/t/ndb_blob.test:
  added testcase for alter table of blob from ndb to myisam
sql/ha_ndbcluster.cc:
  bug #5872, transactions should only be restarted with transaction.on flag off if execute_commit has been performed
  use force send for all executes

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


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged

- Send BOUNDS as KEYINFO
- At restart, only reset KEYINFO

--
Fix resource shortage at KEYINFO in Dbtc and Dblqh w.r.t scan
--


ndb/include/kernel/signaldata/AttrInfo.hpp:
  Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/KeyInfo.hpp:
  Let NdbScanOperation access AttrInfo
ndb/include/kernel/signaldata/ScanFrag.hpp:
  Send KeyLen in ScanFragReq (for range scans)
ndb/include/kernel/signaldata/ScanTab.hpp:
  Send KeyLen in ScanTabReq (for range scans)
ndb/include/ndbapi/NdbConnection.hpp:
  Function for adding op to list
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  new method for saving BOUNDS
ndb/include/ndbapi/NdbOperation.hpp:
  Remove bounds stuff from NdbOperation and put it into NdbScanOperation
ndb/include/ndbapi/NdbScanOperation.hpp:
  reset bounds
ndb/src/common/debugger/signaldata/Makefile.am:
  New signal data printer for ScanFrag
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Fix printout
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  New signal data printer for ScanFrag
ndb/src/kernel/blocks/backup/Backup.cpp:
  Updated ScanFragReq
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Use same sendKeyInfo for both acckeyreq and tux_bounds
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Let range scan use KEYinfo for bounds instead of attrinfo
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle keyinfo in range scan
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Skip useless 5 words in beginning of TuxBounds
ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix SCAN_FRAGREQ
ndb/src/ndbapi/NdbConnection.cpp:
  reset bounds
ndb/src/ndbapi/NdbOperation.cpp:
  Remove bounds
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Remove bounds stuff
ndb/src/ndbapi/NdbOperationInt.cpp:
  Remove bounds stuff
ndb/src/ndbapi/NdbScanOperation.cpp:
  Send BOUNDS in KEYINFO instead of ATTRINFO

sql/item.cc:
  A typo fixed in a comment, which is probably not valid any more
sql/sql_class.h:
  no such class Ttem_subselect.

with the system-reserved (and system-defined) '_REENTRANT' 
CPP identifier.
Especially, it must not be "undefine"d, because the Tru64 compiler
needs it if threads are enabled.


include/my_pthread.h:
  On Tru64, '_REENTRANT' is set by the compiler when the "-pthread" 
  option is given, and it must be set when the system's 'pthread.h' is 
  included (or else a '#error' is activated).
  So it must not be undef'ed, and it should not be def'ed either, as it
  is a system-reserved CPP identifier with which we should not mess
  anyway - it is risky to use it!
  Build on all platforms was checked privately, change caused no errors!

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

switch to using my_ for heap allocations


ndb/include/util/NdbAutoPtr.hpp:
  addes auto pointer class for using with my_ functions
ndb/src/mgmclient/CommandInterpreter.cpp:
  switch to using my_ for heap allocations

  ctype_recode does not hang anymore. Small fix after Marko's change.


sql/sql_show.cc:
  ctype_recode does not hang anymore. Small fix after Marko's change.

mysql-test/mysql-test-run.sh:
  SCCS merged

mysql-test/mysql-test-run.sh:
  SCCS merged

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