• unknown's avatar
    Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 46691ca1
    unknown authored
    into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
    
    
    mysql-test/t/ndb_lock.test:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/ha_ndbcluster.h:
      Auto merged
    storage/ndb/include/ndbapi/NdbTransaction.hpp:
      Auto merged
    mysql-test/r/ndb_lock.result:
      Merge (using local)
    46691ca1
ndb_lock.test 4.82 KB