Sergei Golubchik 639a766096 5.2 merge		2013-05-20 11:13:07 +02:00
..
archive	merge	2012-04-05 23:07:18 +02:00
blackhole	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
csv	Merge with 5.1	2012-04-04 00:33:02 +03:00
example	Fixed buildbot warnings	2011-12-03 20:44:54 +02:00
federated	Merge MariaDB 5.1.66 -> 5.2.12	2012-11-08 15:24:35 +02:00
federatedx
heap	5.2 -> 5.3	2013-02-28 21:48:47 +01:00
ibmdb2i
innobase	5.2 -> 5.3	2013-02-28 21:48:47 +01:00
innodb_plugin	5.2 -> 5.3	2013-02-28 21:48:47 +01:00
maria	5.2 merge	2013-05-20 11:13:07 +02:00
myisam	5.2->5.3 merge	2013-01-10 15:40:21 +01:00
myisammrg	MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg	2013-03-21 11:06:27 +04:00
ndb	Merge with MariaDB 5.1	2011-11-24 18:48:58 +02:00
oqgraph	MDEV-336 oqgraph 5.5 crashes in buildbot	2012-08-24 23:43:18 +02:00
pbxt	Merge 5.2 -> 5.3	2012-11-01 21:36:31 +02:00
sphinx	Fix gcc 4.6 warning after merge with 5.1	2011-10-27 19:18:25 +03:00
xtradb	Merge MariaDB 5.1.66 -> 5.2 -> 5.3	2012-11-09 10:11:20 +02: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