-
unknown authored
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052 storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
5f4d1673
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052 storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged