Commit b30c23af authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  chilla.local:/home/mydev/mysql-5.0--main


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 8c336fbc f7182d52

There are no changes