unknown 60eb775c1d Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 ... into mysql.com:/space/pekka/ndb/version/my51-bug14509 storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged sql/ha_ndbcluster.cc: manual merge storage/ndb/include/ndbapi/Ndb.hpp: SCCS merged storage/ndb/src/ndbapi/Ndb.cpp: SCCS merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: use local, weird diff		2006-05-17 12:56:59 +02:00
..
bin	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
config	fix my_compress/zlib link error	2006-01-17 18:35:15 +01:00
demos	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
docs	Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0	2005-11-23 14:57:00 +02:00
include	Merge mysql.com:/space/pekka/ndb/version/my50-bug14509	2006-05-17 12:56:59 +02:00
lib	Changes to create storage directory for storage engines.	2005-04-26 18:19:54 -07:00
ndbapi-examples	ndb - wl#2972 rbr blobs ndb api support	2006-01-19 14:01:32 +01:00
src	Merge mysql.com:/space/pekka/ndb/version/my50-bug14509	2006-05-17 12:56:59 +02:00
test	Merge mysql.com:/space/pekka/ndb/version/my50-bug14509	2006-05-17 12:56:59 +02:00
tools	Merge mysql.com:/space/pekka/ndb/version/my50-bug14509	2006-05-17 12:56:59 +02:00
Makefile.am	Nuke all of the old_* directories in the ndb tree.	2006-04-18 12:12:46 -07:00