into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Manual merge.
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Manual merge.
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Manual merge.
storage/ndb/test/ndbapi/testBlobs.cpp:
  Manual merge.