-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged sql/ha_ndbcluster.cc: Auto merged BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0: Auto merged
317b4074