Commit 03c6f8cb authored by unknown's avatar unknown
Browse files

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285


storage/ndb/src/ndbapi/NdbBlob.cpp:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  use local
parents 6e0cdd89 76d2ecea

storage/ndb/src/ndbapi/NdbBlob.cpp

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ NdbBlob::writeData(const void* data, Uint32 bytes) 
  }

  const char* buf = static_cast<const char*>(data);

  int ret = writeDataPrivate(buf, bytes);

  DBUG_RETURN(0);

  DBUG_RETURN(ret);

}



int