Alexander Nozdrin 9dc8347c1e Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/t/bug46080.test		2010-02-03 19:21:17 +03:00
..
archive	Manual merge from mysql-trunk-merge.	2010-01-28 01:13:10 +03:00
blackhole	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
csv	Merge mysql-next-mr to mysql-next-mr-svoj.	2009-12-09 15:03:34 +04:00
example	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
federated	WL#2360 Performance schema	2009-12-09 20:19:51 -07:00
heap	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
ibmdb2i	Manual merge from mysql-next-mr.	2009-12-22 09:32:58 +03:00
innobase	Applying InnoDB snapshot, fixes BUG#46193.	2010-01-22 13:57:02 +04:00
myisam	WL#2360 Performance schema	2010-01-06 22:42:07 -07:00
myisammrg	Manual merge from mysql-trunk-merge.	2010-02-03 19:21:17 +03:00
ndb	Manual merge from mysql-trunk-merge.	2010-01-28 01:13:10 +03:00
perfschema	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
Makefile.am	Backport WL#3653 to 5.1 to enable bundled innodb plugin.	2009-06-10 10:59:49 +02:00
mysql_storage_engine.cmake	WL#4903 Plugin Service API part I	2009-11-02 21:05:42 +01:00