mariadb/storage/ndb
unknown b6479b3b38 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  manual merge
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  manual merge
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge
2006-08-15 11:49:40 +08: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 perch.ndb.mysql.com:/home/jonas/src/50-work 2006-08-14 14:11:51 +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 willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 2006-08-15 11:49:40 +08:00
test Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-08-14 14:11:51 +02:00
tools Merge bk-internal:/home/bk/mysql-5.1 2006-07-19 08:57:52 +02:00
Makefile.am Merge 2006-06-20 11:11:18 +02:00