unknown 37b79d90d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ... into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb client/mysql.cc: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/rpl_temporary.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/rpl_temporary.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged mysql-test/r/information_schema.result: manual merge mysql-test/t/information_schema.test: manual merge sql/ha_ndbcluster.cc: manual merge storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: manual merge storage/ndb/src/ndbapi/DictCache.cpp: manual merge		2006-05-16 10:37:40 +02:00
..
debugger
editline
kernel
logger
mgmapi
mgmcommon
ndbapi	Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0	2006-05-16 10:37:40 +02:00
newtonapi
portlib
transporter
util
Makefile.am
ndb_constants.h
ndb_global.h.in
ndb_init.h
ndb_net.h
ndb_types.h.in
ndb_version.h.in