• unknown's avatar
    Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · c8dc26b4
    unknown authored
    into mysql.com:/home/jonas/src/mysql-5.0
    
    
    BitKeeper/etc/logging_ok:
      auto-union
    ndb/include/ndbapi/NdbDictionary.hpp:
      Auto merged
    ndb/src/common/util/Makefile.am:
      Auto merged
    ndb/src/kernel/blocks/backup/Backup.cpp:
      Auto merged
    ndb/src/kernel/blocks/backup/Backup.hpp:
      Auto merged
    ndb/src/kernel/blocks/backup/BackupInit.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
      Auto merged
    ndb/src/ndbapi/NdbDictionary.cpp:
      Auto merged
    ndb/src/ndbapi/NdbDictionaryImpl.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.cpp:
      Auto merged
    ndb/src/ndbapi/TransporterFacade.hpp:
      Auto merged
    ndb/src/ndbapi/ndberror.c:
      Auto merged
    ndb/test/ndbapi/Makefile.am:
      Auto merged
    ndb/test/tools/Makefile.am:
      Auto merged
    ndb/tools/restore/restore_main.cpp:
      Auto merged
    c8dc26b4
Makefile.am 1012 Bytes