-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca storage/ndb/tools/waiter.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: merge storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: merge
019c72a4
into perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca storage/ndb/tools/waiter.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: merge storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: merge