mariadb/storage/ndb
unknown 0f4043663a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge
2006-05-16 12:00:16 +02:00
..
bin
config fix my_compress/zlib link error 2006-01-17 18:35:15 +01:00
demos
docs
include Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-05-16 10:37:40 +02:00
lib
ndbapi-examples ndb - wl#2972 rbr blobs ndb api support 2006-01-19 14:01:32 +01:00
src Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-05-16 12:00:16 +02:00
test Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-05 11:38:05 +03:00
tools Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-05-05 11:38:05 +03:00
Makefile.am Nuke all of the old_* directories in the ndb tree. 2006-04-18 12:12:46 -07:00