mariadb/storage/ndb/include/kernel
unknown bb36c6deaa Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
2005-07-20 13:44:55 +02:00
..
signaldata Merge mysql.com:/home/jonas/src/mysql-5.0 2005-07-20 13:44:55 +02:00
AttributeDescriptor.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
AttributeHeader.hpp Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
AttributeList.hpp Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-06-08 17:12:09 +02:00
BlockNumbers.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
GlobalSignalNumbers.h Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
GrepEvent.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Interpreter.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_config_parameters.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
kernel_types.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
LogLevel.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_limits.h Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
NodeBitmask.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NodeInfo.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NodeState.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
RefConvert.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
trigger_definitions.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00