mariadb/ndb
unknown 84b8f11141 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge
2006-05-15 18:44:17 +02:00
..
bin
config BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j. 2006-01-08 07:42:40 +01:00
demos
docs Merge 2005-11-04 02:17:11 +01:00
home removed a bunch of "dead" files from the ndb src tree 2004-11-05 23:59:06 +00:00
include Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 2006-05-15 18:44:17 +02:00
lib
ndbapi-examples updated example makefiles to add libmystrings 2005-03-03 20:21:45 +01:00
src Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 2006-05-15 18:44:17 +02:00
test Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 2006-05-03 23:17:16 +02:00
tools Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 2006-05-03 23:17:16 +02:00
Makefile.am moved sorting and duplicate check for unique indexes from api to kernel 2005-01-27 10:44:47 +01:00