mariadb/storage/ndb/include
unknown 8f7696d266 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines


extra/perror.c:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_insert.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
2007-06-17 17:21:27 +02:00
..
debugger Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb 2007-06-14 19:57:50 +08: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 get mgmapi error codes into perror 2007-06-14 12:35:35 +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 mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 2007-06-14 16:10:11 +02:00
newtonapi Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-23 20:20:40 +01:00
portlib Bug #28899 not possible to set separate watchdog timeout at startup 2007-06-05 17:06:33 +02:00
transporter Merge mysql.com:/home/my/mysql-5.0 2007-01-27 03:46:45 +02:00
util WL#3817: Simplify string / memory area types and make things more consistent (first part) 2007-05-10 12:59:39 +03:00
Makefile.am Makefile.am: 2007-06-14 12:57:32 +02: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 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 2007-06-05 18:00:42 +02: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