Commit f34e0a39 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/marty/MySQL/mysql-5.0 

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


BitKeeper/deleted/.del-ndb_rename.result:
  Delete: mysql-test/r/ndb_rename.result
BitKeeper/deleted/.del-ndb_rename.test:
  Delete: mysql-test/t/ndb_rename.test
sql/ha_ndbcluster.cc:
  Merge (using local)
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge (using local)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Merge (using local)
parents d63396c2 83cd9eca

There are no changes