unknown c84d4b2139 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 ... into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/rpl/r/rpl_bug31076.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_update.cc: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged mysql-test/suite/rpl/t/rpl_bug31076.test: manual merge		2007-10-30 11:28:19 +01: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 loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca	2007-10-25 10:48:42 +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 whalegate.ndb.mysql.com:/home/tomas/cge-5.1	2007-10-30 11:28:19 +01:00
newtonapi	Merge mysql.com:/home/kent/bk/main/mysql-5.0	2006-12-23 20:20:40 +01:00
portlib	align types	2007-09-29 09:26:33 +02:00
transporter	Merge mysql.com:/home/my/mysql-5.0	2007-01-27 03:46:45 +02:00
util	ndb_rand.c:	2007-09-25 12:16:39 +02: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	ndb - bug#26450	2007-10-23 11:24:34 +02:00