into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug29186


storage/ndb/src/ndbapi/ndberror.c:
  Auto merged