bzr push into mysql-5.1 branch (tomas.ulin:2718 to 2719)

[Tomas Ulin]

 2719 Tomas Ulin	2008-11-06
      fix race in test
modified:
  mysql-test/suite/ndb/t/ndb_dbug_lock.test

 2718 Magnus Svensson	2008-11-06 [merge]
      Merge
modified:
  BUILD/SETUP.sh
  storage/ndb/include/debugger/SignalLoggerManager.hpp
  storage/ndb/include/logger/Logger.hpp
  storage/ndb/include/ndbapi/Ndb.hpp
  storage/ndb/include/util/BaseString.hpp
  storage/ndb/include/util/NdbOut.hpp
  storage/ndb/include/util/OutputStream.hpp
  storage/ndb/include/util/basestring_vsnprintf.h
  storage/ndb/include/util/socket_io.h
  storage/ndb/src/common/debugger/EventLogger.cpp
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
  storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.hpp
  storage/ndb/src/kernel/vm/SimulatedBlock.hpp
  storage/ndb/src/kernel/vm/WatchDog.cpp
  storage/ndb/src/mgmapi/LocalConfig.cpp
  storage/ndb/src/ndbapi/Ndb.cpp
  storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
  storage/ndb/src/ndbapi/NdbScanOperation.cpp
  storage/ndb/src/ndbapi/NdbTransaction.cpp
  storage/ndb/src/ndbapi/Ndbif.cpp
  storage/ndb/src/ndbapi/ObjectMap.hpp

=== modified file 'mysql-test/suite/ndb/t/ndb_dbug_lock.test'
--- a/mysql-test/suite/ndb/t/ndb_dbug_lock.test	2008-10-29 13:09:15 +0000
+++ b/mysql-test/suite/ndb/t/ndb_dbug_lock.test	2008-11-06 18:54:30 +0000
@@ -47,6 +47,7 @@ lock tables t1 write;
 --echo # issue alter in parallell, which should be hanging waiting on
 --connection another_con
 --send alter table t1 add column (d int)
+--sleep 1
 
 --echo # check thread state which should be:
 --echo # "Waiting for allowed to take ndbcluster global schema lock"