• unknown's avatar
    Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 7715c4a2
    unknown authored
    into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug24363
    
    
    storage/ndb/tools/restore/consumer.hpp:
      Auto merged
    storage/ndb/tools/restore/consumer_restore.cpp:
      Auto merged
    storage/ndb/tools/restore/consumer_restore.hpp:
      Auto merged
    storage/ndb/tools/restore/restore_main.cpp:
      Auto merged
    7715c4a2
restore_main.cpp 19.2 KB