into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/util/InputStream.hpp:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  manual merge
storage/ndb/test/ndbapi/testMgm.cpp:
  manual merge