• unknown's avatar
    Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 69f750c3
    unknown authored
    into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
    
    
    storage/ndb/src/kernel/blocks/ERROR_codes.txt:
      Auto merged
    storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
      Auto merged
    storage/ndb/test/run-test/daily-basic-tests.txt:
      Auto merged
    storage/ndb/test/ndbapi/testNodeRestart.cpp:
      manual merge
    69f750c3
NdbcntrMain.cpp 85.6 KB