unknown 008b1e5227 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge ... into mysql.com:/home/stewart/Documents/MySQL/5.1/main storage/ndb/include/util/ConfigValues.hpp: Auto merged storage/ndb/src/common/util/ConfigValues.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: manual merge (n/a in 5.1)		2006-06-20 17:33:14 +10:00
..
debugger	ndb-wl2325.patch	2005-09-15 11:33:50 +02:00
editline	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
kernel	Merge jonas@perch:src/51-jonas	2006-06-12 13:46:10 +02:00
logger	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
mgmapi	Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue	2006-06-16 20:52:21 +10:00
mgmcommon	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
ndbapi	Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285	2006-06-17 11:10:43 +02:00
newtonapi	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
portlib	Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0	2005-08-25 13:11:38 -04:00
transporter	Remove compiler warnings	2006-03-29 17:04:00 +03:00
util	Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge	2006-06-20 17:33:14 +10:00
Makefile.am	Merge	2005-10-07 01:12:46 +02:00
ndb_constants.h	Import ndb varsize	2005-11-07 12:19:28 +01:00
ndb_global.h.in	configure.in:	2005-11-08 07:41:46 +01:00
ndb_init.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_net.h	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndb_types.h.in	Make storage engines "pluggable", handlerton work	2005-11-07 16:25:06 +01:00
ndb_version.h.in	WL #2747: Fix such that backup and restore works for user defined	2006-01-17 09:25:12 +01:00