Commit 5506f6ca authored by unknown's avatar unknown

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/Makefile.am:
  Using local, will merge manually
sql/ha_ndbcluster.cc:
  Using local, will merge manually.
sql/ha_ndbcluster.h:
  Using local, will merge manually.
parents d381937b 25b372b3
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment