mariadb/storage
unknown e60119f8a5 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/t/ndb_alter_table.test:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  manual merge
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge [needs more fixes]
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged
2006-05-16 09:37:11 +02:00
..
archive Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
bdb Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
blackhole manual merge bug#10952 2006-05-12 08:50:31 -07:00
csv Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
example Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
heap Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
innobase Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
myisam Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
myisammrg Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
ndb Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 2006-05-16 09:37:11 +02:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00