into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/test/include/NdbRestarter.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
merge