testBasic LocksAndInserts


ndb/test/src/HugoTransactions.cpp:
  Fix HugoTransaction::load so that transaction is closed and started if
  error is found

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

  are undo-logged in correct order

Add bunch of testcases to autotest


ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Send fragrecord ptr to initOpConnection so that is does not
  have to look it up every time (if needed)
  
  Make operation list on fragment fifo so that uncommitted operations
    are undo-logged in correct order
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Send fragptr to initOpConnection
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  dllist -> dlfifolist
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  dllist -> dlfifolist
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Make operation list on fragment fifo so that uncommitted operations
    are undo-logged in correct order
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix uninitialized variable c_start.m_startTime
    which made startPartial and startPartitioned fail
ndb/test/ndbapi/testSystemRestart.cpp:
  Added testSystemRestart -n SR9 which
    demonstrates that two prepared operation on same
    records _used to_ be undo-logged in wrong order makeing
    system restart fail
ndb/test/run-test/daily-devel-tests.txt:
  Add
  * testSystemRestart -n SR6
    Restart while some nodes have fs and other not
  * testSystemRestart -n SR7
    Restart in partition win
  * testSystemRestart -n SR8
    Restart in partition win, others starting during restart
  * testSystemRestart -n SR9
    Multiple ops on same record prepared before

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


sql/ha_ndbcluster.cc:
  Auto merged

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

allow blank lines in Ndb.cfg files

remove -e from atrt-mysql-test-run

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


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

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


BitKeeper/etc/logging_ok:
  auto-union

acinclude.m4:
  Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

into neptunus.(none):/home/magnus/mysql/mysql-4.1

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


ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

into mysql.com:/GORDON/MySQL/mysql-4.1/src

These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible

They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.


mysql-test/include/ps_modify.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Merge fixes


mysql-test/r/ndb_insert.result:
  Correct test cases and result after merge
mysql-test/t/ndb_insert.test:
  Correct test cases and result after merge
sql/ha_ndbcluster.cc:
  Correct get_error_message after merge
  Use buf pointer in get_ndb_value

uninit variable


ndb/src/kernel/vm/Configuration.cpp:
  init variable

Improved Default SCI config params
Added missing SCI libraries in ndb_mgm and atrt
Added max of 1024 signals per receive on transporter (to improve
real-time bahaviour and to ensure no job buffer explosion, still
some more work left on avoiding job buffer explosion in the general
case)


ndb/src/common/transporter/Packer.cpp:
  Fix for job buffer explosion and real-time behaviour also in
  high load scenarios.
ndb/src/common/transporter/SCI_Transporter.cpp:
  Restored old Shared memory buffer implementation.
  Changed condition slightly on when to send SCI buffer.
ndb/src/common/transporter/SCI_Transporter.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Buffer.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.cpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.hpp:
  Changed back to old shared memory implementation
ndb/src/common/transporter/TransporterRegistry.cpp:
  Changed back to old shared memory implementation
ndb/src/kernel/vm/FastScheduler.hpp:
  Spelling error
ndb/src/mgmclient/Makefile.am:
  Missing SCI library
ndb/src/mgmsrv/ConfigInfo.cpp:
  Changed to more proper config parameters
ndb/test/run-test/Makefile.am:
  Added missing SCI library

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

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_insert.result:
  Merge new test cases
mysql-test/t/ndb_insert.test:
  Merge new test cases

into neptunus.(none):/home/magnus/mysql/mysql-4.1

Use ndb_mgm_listen_event to wait for backup messages


ndb/src/mgmclient/CommandInterpreter.cpp:
  Listen to backup event
  start backup
  wait until event related to backup arrives
ndb/src/mgmsrv/Services.cpp:
  Fix newline at end of reply

key Column Fails".


mysql-test/r/ps.result:
  Test results updated: a test case for Bug#5510 "inserting Null in 
  AutoIncrement primary key Column Fails".
mysql-test/r/ps_2myisam.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_3innodb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_4heap.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_5merge.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_6bdb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/t/ps.test:
  A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails".
sql/item.cc:
  A fix for bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails": use proper Field API function for NULL placholeders.

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

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

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

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

removed some #id 0 code


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  replaced some "localhost" checks with try bind
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed some #id 0 code

ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  jamEntry
mysql-test/r/ndb_index.result:
  ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
  ndb charsets: minimal fix to make test pass

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged