mariadb/storage/ndb/include
unknown 002d7efa47 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/main/mysql-5.1


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/Extent.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/print_file.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.hpp:
  Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp:
  Auto merged
2006-12-31 01:04:59 +01:00
..
debugger Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
editline Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
kernel Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-12-31 01:04:59 +01:00
logger Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mgmapi Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-12-27 11:01:54 +01:00
mgmcommon Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndbapi Many files: 2006-12-27 02:23:51 +01:00
newtonapi Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
portlib Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
transporter Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
util Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
Makefile.am Merge 2005-10-07 01:12:46 +02:00
ndb_constants.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_global.h.in Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_init.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_net.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndb_types.h.in Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
ndb_version.h.in Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00