-
unknown authored
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052 storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Manual merged
1b0a7c4d
into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052 storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Manual merged