mariadb/storage
unknown e5ed857ef1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
2006-12-04 20:56:37 +01:00
..
archive Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
blackhole Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge 2006-10-18 18:51:39 +10:00
csv Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
example Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
federated Merge chilla.local:/home/mydev/mysql-5.0-axmrg 2006-12-01 23:01:33 +01:00
heap Merge mysql.com:/home/my/mysql-5.0 2006-11-30 22:38:12 +02:00
innobase Removed compiler warnings 2006-11-27 18:16:08 +02:00
myisam Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-12-01 22:59:51 +01:00
myisammrg Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-11-30 23:27:16 +02:00
ndb Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 2006-12-01 21:12:13 +01:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00