mariadb/storage/ndb/include
unknown dfb34b0738 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


mysql-test/ndb/ndb_config_1_node.ini:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
2007-06-04 10:29:57 +02: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 perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 2007-05-14 10:39:46 +02:00
logger Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
mgmapi Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 2007-06-04 10:29:57 +02:00
mgmcommon [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 2007-03-22 22:35:31 +11:00
ndbapi Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-05-09 15:04:45 +02:00
newtonapi Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
portlib Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2007-01-17 21:25:56 +01:00
transporter Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
util Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11 2007-04-11 18:10:45 +02:00
Makefile.am Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
ndb_constants.h Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 2007-03-23 14:06:00 +01:00
ndb_global.h.in BUG#19033 (RBR: slave does not handle schema changes correctly): 2007-02-23 18:54:26 +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 Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01: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 joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 2007-01-11 21:13:17 +01:00