unknown 6708dbdbf2 Merge mysql.com:/home/jonas/src/mysql-4.1 ...

into  mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  merge
ndb/src/ndbapi/ndberror.c:
  merge
ndb/test/include/HugoOperations.hpp:
  merge
ndb/test/src/HugoOperations.cpp:
  merge

2005-07-20 13:25:52 +02:00

7.1 KiB

Raw Blame History

View Raw