-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.h: Auto merged mysql-test/r/ndb_basic.result: manual merge mysql-test/t/ndb_basic.test: manual merge sql/ha_ndbcluster.cc: manual merge
76d98963
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 sql/ha_ndbcluster.h: Auto merged mysql-test/r/ndb_basic.result: manual merge mysql-test/t/ndb_basic.test: manual merge sql/ha_ndbcluster.cc: manual merge