mariadb/ndb/include
unknown 5df5f5c174 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
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
2004-12-31 06:14:18 +01:00
..
debugger merge 2004-12-17 10:36:14 +01:00
editline
kernel Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2004-12-31 06:14:18 +01:00
logger merge 2004-12-17 10:36:14 +01:00
mgmapi added config parameter Group on connection 2004-12-20 12:36:14 +01:00
mgmcommon merge 2004-12-17 10:36:14 +01:00
ndbapi Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2004-12-31 06:14:18 +01:00
newtonapi
portlib merge 2004-11-16 07:22:30 +01:00
transporter merge 2004-12-16 21:55:50 +01:00
util Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 2004-12-31 06:14:18 +01:00
Makefile.am merge 2004-12-17 10:36:14 +01:00
ndb_global.h.in wl1744 - ndb on windows 2004-11-16 07:20:30 +01:00
ndb_net.h
ndb_types.h wl1744- ndb windows 2004-11-11 08:15:52 +01:00
ndb_version.h.in wl1744 - ndb windows port 2004-11-10 21:43:12 +01:00