• unknown's avatar
    Merge mysql.com:/home/jonas/src/mysql-4.1-fix · bf0b3493
    unknown authored
    into mysql.com:/home/jonas/src/wl1744
    
    
    BitKeeper/etc/logging_ok:
      auto-union
    configure.in:
      Auto merged
    ndb/include/Makefile.am:
      Auto merged
    ndb/src/common/mgmcommon/ConfigRetriever.cpp:
      Auto merged
    ndb/src/common/util/version.c:
      Auto merged
    ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
      Auto merged
    ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
      Auto merged
    ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      Auto merged
    ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Auto merged
    ndb/src/mgmsrv/main.cpp:
      Auto merged
    ndb/src/ndbapi/NdbConnection.cpp:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    bf0b3493
Dbdih.hpp 56.7 KB