unknown dc86ad6dc4 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover ... into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_ndbcluster_binlog.h: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged sql/ha_ndbcluster_binlog.cc: Merge		2006-02-21 13:54:58 +01:00
..
debugger
editline
kernel	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover	2006-02-21 13:54:58 +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	Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover	2006-02-21 13:54:58 +01:00
newtonapi
portlib
transporter
util	Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug17411-thisisaverylongnamethatshouldbewaylongerthanthe128limitthatweprivouslyhadbutireallywantotestitandseethatitdoesreallywork.nowitshouldbeabout160charslongnonow.iwonderifanythingwillchokeornotwiththisoutrageouslylongpathname	2006-02-16 15:51:37 +11:00
Makefile.am
ndb_constants.h
ndb_global.h.in
ndb_init.h
ndb_net.h
ndb_types.h.in
ndb_version.h.in	WL #2747: Fix such that backup and restore works for user defined	2006-01-17 09:25:12 +01:00