Commit cf465f7e authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-axmrg 

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents 0db1a148 fe8c67ef

There are no changes