into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged