mariadb/storage/ndb
unknown 1f07de22e0 Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into  mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb


BUILD/Makefile.am:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
  Auto merged
libmysqld/Makefile.am:
  Manual merge
libmysqld/examples/Makefile.am:
  Manual merge
2007-05-07 15:39:36 +02:00
..
bin
config
demos
docs
include
lib
ndbapi-examples
src Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb 2007-05-07 15:39:36 +02:00
test ndb - bug#28276 2007-05-07 13:48:27 +02:00
tools
Makefile.am
plug.in