mariadb/storage
unknown f2e7433826 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/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
2006-06-20 19:33:25 +02:00
..
archive Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
bdb Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
blackhole Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
csv After merge fixes 2006-06-05 06:16:08 +03:00
example Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
heap Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
innobase Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
myisam Merge mysql.com:/home/mydev/mysql-5.1--main 2006-06-09 13:51:41 +02:00
myisammrg Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ndb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-06-20 19:33:25 +02:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00