mariadb/storage/ndb/include/kernel
unknown d8d857e0cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  SCCS merged
2008-01-10 19:49:32 +08:00
..
signaldata Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb 2008-01-10 19:49:32 +08:00
AttributeDescriptor.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
AttributeHeader.hpp Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca 2007-10-25 10:48:42 +02:00
AttributeList.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
BlockNumbers.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
GlobalSignalNumbers.h ndb - bug#26450 2007-10-23 11:24:34 +02:00
GrepEvent.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Interpreter.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
kernel_config_parameters.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
kernel_types.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
LogLevel.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_limits.h Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298 2008-01-10 13:47:14 +08:00
NodeBitmask.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
NodeInfo.hpp Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 2007-01-11 21:13:17 +01:00
NodeState.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
RefConvert.hpp Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
trigger_definitions.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00