into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/t/ndb_alter_table.test:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  manual merge
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge [needs more fixes]
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged