into  dev3-63.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug22025


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged