-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: manual merge storage/ndb/test/ndbapi/testNodeRestart.cpp: manual merge
7cbf613d