Michael Widenius 474ee1eedb Merge from 5.2		2012-03-30 13:54:33 +03:00
..
archive	Automatic merge	2012-03-28 13:58:14 +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.2	2011-03-09 15:47:59 +02:00
heap	Speedups:	2012-03-23 18:11:29 +02:00
ibmdb2i	Fixed typos	2011-01-07 13:45:59 +02:00
innobase	merge	2012-03-21 19:15:29 +01:00
innodb_plugin	Bug fix for MySQL bug#61209 "auto_increment_offset != 1 + innodb_autoinc_lock_mode=1 => bulk inserts fail"	2012-03-26 16:06:42 +03:00
maria	Merge from 5.2	2012-03-30 13:54:33 +03:00
myisam	Automatic merge	2012-03-28 13:58:14 +03:00
myisammrg	Merge with 5.2.	2011-12-11 11:34:44 +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.2	2011-12-14 20:36:51 +02:00
sphinx	Fix gcc 4.6 warning after merge with 5.1	2011-10-27 19:18:25 +03:00
xtradb	Bug fix for MySQL bug#61209 "auto_increment_offset != 1 + innodb_autoinc_lock_mode=1 => bulk inserts fail"	2012-03-26 16:06:42 +03: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