• unknown's avatar
    Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb · d8d857e0
    unknown authored
    into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
    
    
    storage/ndb/src/kernel/blocks/backup/Backup.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/lgman.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/tsman.cpp:
      Auto merged
    storage/ndb/test/ndbapi/testDict.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/ERROR_codes.txt:
      SCCS merged
    storage/ndb/src/ndbapi/ndberror.c:
      SCCS merged
    d8d857e0
ndberror.c 35 KB