into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Make sure index scan does not commitDelete


mysql-test/r/ndb_index_ordered.result:
  testcase
mysql-test/t/ndb_index_ordered.test:
  testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure index scan does not commitDelete

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  merge

  


ndb/src/common/util/socket_io.cpp:
  Fix problem with cut sockmessages

nicer error message to user, along with error code to help track down the problem.


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Report error when creating table (restartCreateTab_dihComplete) 
  to user in a nicer way.

BitKeeper/deleted/.del-NdbErrHnd.cpp:
  Delete: storage/ndb/src/common/util/NdbErrHnd.cpp
BitKeeper/deleted/.del-MemoryChannelOSE.hpp:
  Delete: storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
BitKeeper/deleted/.del-Makefile:
  Delete: storage/ndb/src/common/transporter/priotest/prioOSE/Makefile
BitKeeper/deleted/.del-OSE_Receiver.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.cpp
BitKeeper/deleted/.del-OSE_Receiver.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Receiver.hpp
BitKeeper/deleted/.del-OSE_Signals.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Signals.hpp
BitKeeper/deleted/.del-OSE_Transporter.cpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.cpp
BitKeeper/deleted/.del-OSE_Transporter.hpp:
  Delete: storage/ndb/src/common/transporter/OSE_Transporter.hpp
BitKeeper/deleted/.del-mmslist.cpp:
  Delete: storage/ndb/src/common/portlib/mmslist.cpp

BUG#22305  	SysLogHandler not thread safe
BUG#22313  	can get duplicate log messages in cluster log

Fix all these problems with one patch. Make Logger, hence EventLogger (with a 
bit more) thread safe.


storage/ndb/include/debugger/EventLogger.hpp:
  remove m_text to make thread safe
storage/ndb/include/logger/Logger.hpp:
  Use mutex to protect member variables for multithreaded use.
storage/ndb/src/common/debugger/EventLogger.cpp:
  use a string on the stack instead of member variable to make class thread safe
storage/ndb/src/common/logger/Logger.cpp:
  use mutexes to Guard member variables. makes class therad safe

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work


storage/ndb/include/logger/FileLogHandler.hpp:
  Auto merged
storage/ndb/include/util/File.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending


include/my_sys.h:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/t/ndb_multi.test:
  SCCS merged

  remove timeing dependant part of test


mysql-test/r/ndb_multi.result:
  remove timeing dependant part of test
mysql-test/t/ndb_multi.test:
  remove timeing dependant part of test

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

  Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release

ndb/include/logger/FileLogHandler.hpp:
  use off_t for file offset
ndb/include/util/File.hpp:
  use off_t for returning file offset (size)
ndb/src/common/util/File.cpp:
  make File_class::size(FILE*) safe when having multiple threads writing to
  the file

make the File_class::flush() method actually flush the stdio buffers.


ndb/src/common/logger/FileLogHandler.cpp:
  remove misleading comment
ndb/src/common/util/File.cpp:
  actually flush the stdio buffers.
  
  remove unneeded // private comment

Deadlock when running ndb_cache tests with --debug. Query cache locks on trying
to acquire lock.


sql/sql_cache.cc:
  in query_cache_end_of_result, unlock in reverse order of locking.
  
  also make it possible to run with --debug without hanging.

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  remove redundant unpackBound call, missed in previous patch

Bug #21072  Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/handler.cc:
  Using local

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

mysql-test/r/ndb_multi.result:
  update result file with post-merge results
sql/ha_ndbcluster.cc:
  update usage of ndb_get_table_statistics for changes made for bug 19914

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


sql/handler.cc:
  Auto merged

Bug #21072  Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/include/util/UtilBuffer.hpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


sql/sql_select.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/r/ndb_multi.result:
  merge result file
mysql-test/t/ndb_multi.test:
  merge test
sql/ha_ndbcluster.cc:
  merge ndb_get_table_statistics definition and usage
sql/ha_ndbcluster.h:
  merge

bugs.


ndb/include/util/UtilBuffer.hpp:
  Fix accessing memory after free(), if called with source and destination
  pointer the same (which should not really happen...).
  Fixes a problem in ndb_restore.
ndb/src/common/util/SimpleProperties.cpp:
  Fix typo in check of maxValue.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged