unknown 67e16225ec manual merge ... sql/ha_ndbcluster.cc: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged		2006-02-13 14:25:31 +01: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 localhost:src/51-new	2006-02-02 20:18:50 +01:00
logger	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
mgmapi	manual merge	2006-02-13 14:25:31 +01:00
mgmcommon	Merge mysql.com:/home/kostja/mysql/tmp_merge	2006-02-02 23:27:06 +03:00
ndbapi	manual merge	2006-02-13 14:25:31 +01: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	Merge mysql.com:/home/my/mysql-5.0	2005-11-05 01:32:55 +02:00
util	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	2006-01-13 09:22:02 +01: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