unknown ec885d9caa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb ... into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 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/CommandInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: SCCS merged		2007-06-14 18:43:29 +02:00
..
bin	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
config	Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj	2007-04-24 10:28:11 +08:00
demos	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
docs	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
include	Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb	2007-06-14 20:30:48 +08:00
lib	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndbapi-examples	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	2007-05-30 12:36:33 +02:00
src	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	2007-06-14 18:43:29 +02:00
test	[PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly	2007-06-13 22:54:00 +10:00
tools	Bug #29103 ndb_restore segfaults on NULL var[char|binary]	2007-06-14 12:51:13 +02:00
MAINTAINERS	[PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples	2007-06-13 23:53:01 +10:00
Makefile.am	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-31 01:32:21 +01:00
plug.in	Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.	2006-08-18 21:19:19 -07:00