Michael Widenius deaf220c50 Automatic merge		2012-03-30 13:51:16 +03:00
..
archive	Merge with 5.1	2012-03-28 13:49:07 +03:00
blackhole	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
csv	Merge with 5.1	2012-03-28 13:49:07 +03:00
example	Fixed buildbot warnings	2011-12-03 20:44:54 +02:00
federated	Merge with 5.1	2011-11-30 22:57:18 +02:00
federatedx	Merge with 5.1 to get in changes from MySQL 5.1.55	2011-02-28 19:39:30 +02:00
heap	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
ibmdb2i	Fixed typos	2011-01-07 13:45:59 +02:00
innobase	Fix access to uninitialized variable in innodb error message in case WriteFile() fails.	2012-03-15 15:06:06 +01:00
innodb_plugin	Merge with MariaDB 5.1 and MySQL 5.1.61	2012-02-20 17:49:21 +02:00
maria	Automatic merge	2012-03-30 13:51:16 +03:00
myisam	Merge with 5.1	2012-03-28 13:49:07 +03:00
myisammrg	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
ndb	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
oqgraph	LPBUG#906638 : Fixes to build oqgraph with boost 1.48	2011-12-22 15:50:33 +01:00
pbxt	Merge with 5.1	2011-12-13 20:08:41 +02:00
sphinx	Fix gcc 4.6 warning after merge with 5.1	2011-10-27 19:18:25 +03:00
xtradb	merge	2012-03-21 18:30:34 +01:00
Makefile.am	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	2011-11-21 19:13:14 +02:00
mysql_storage_engine.cmake	on windows: don't link all plugins with mysqld, only do it for storage engines.	2011-12-29 22:52:13 +01:00