Commit 51c81241 authored by unknown's avatar unknown

Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge

into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  dont see anything here, use local
parents 697eaf4a 485f35eb
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