• unknown's avatar
    Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb · 96c4b8db
    unknown authored
    into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
    
    
    sql/ha_ndbcluster.cc:
      Auto merged
    storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
      Auto merged
    storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
      Auto merged
    storage/ndb/tools/restore/restore_main.cpp:
      Auto merged
    96c4b8db
ha_ndbcluster.cc 294 KB