mysql-test/t/ndb_lock.test · ed481c39e7474b127c76f454787d75972aee685f · Kirill Smelkov / mariadb

Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 115eb7df

unknown authored Aug 15, 2006

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge
sql/ha_ndbcluster.h:
  Merge

115eb7df

ndb_lock.test 4.04 KB

Replace ndb_lock.test