unknown 46691ca122 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 ...

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)

2006-08-15 11:49:04 +02:00

4.8 KiB

Raw Blame History

View Raw