mariadb/storage
unknown d38743ffc3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


configure.in:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-05-20 06:25:02 +02:00
..
bdb Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
heap Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-09 20:28:54 +02:00
innobase merge 2005-05-17 10:17:53 +02:00
myisam merge 2005-05-19 09:04:24 +02:00
myisammrg Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-02 13:18:26 +02:00
ndb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-20 06:25:02 +02:00
Makefile.am make dist target fixes 2005-05-16 14:11:42 +02:00