• unknown's avatar
    Merge perch.ndb.mysql.com:/home/jonas/src/51-clean · 1cf6bc4b
    unknown authored
    into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
    
    
    mysql-test/r/ndb_lock.result:
      Auto merged
    mysql-test/t/ndb_lock.test:
      Auto merged
    sql/ha_ndbcluster.h:
      Auto merged
    storage/ndb/include/ndbapi/NdbTransaction.hpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    mysql-test/t/disabled.def:
      SCCS merged
    sql/ha_ndbcluster.cc:
      e
      merge
    1cf6bc4b
disabled.def 3.32 KB