-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: merge storage/ndb/src/ndbapi/ndberror.c: merge
4e98c2e8