mariadb/storage/ndb/include/kernel
unknown 2dc4e17098 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781


storage/ndb/include/ndb_version.h.in:
  manual merge
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  SCCS merged
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  SCCS merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  SCCS merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  SCCS merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  manual merge
storage/ndb/src/kernel/main.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  SCCS merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  SCCS merged
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  use local
storage/ndb/src/kernel/vm/pc.hpp:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  use local - add 711 later
storage/ndb/test/ndbapi/testDict.cpp:
  SCCS merged
2006-06-15 14:49:48 +02:00
..
signaldata Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781 2006-06-15 14:49:48 +02:00
AttributeDescriptor.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
AttributeHeader.hpp wl2723 - ndb opt. nr 2006-01-11 11:35:25 +01:00
AttributeList.hpp ndb - bug with index build of unique index with 32 attributes 2005-11-05 22:50:15 +01:00
BlockNumbers.h Import ndb varsize 2005-11-07 12:19:28 +01:00
GlobalSignalNumbers.h Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781 2006-06-15 14:49:48 +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 Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree. 2005-11-08 17:30:41 +01:00
LogLevel.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_limits.h Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 2006-03-01 10:20:40 +01:00
NodeBitmask.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NodeInfo.hpp ndb-wl2325.patch 2005-09-15 11:33:50 +02: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 configure.in: 2005-11-08 07:41:46 +01:00