Alexander Nozdrin 9f335d9e91 Manual merge from mysql-trunk. ... Conflicts: - storage/myisam/mi_static.c		2009-12-24 10:12:07 +03:00
..
archive	Automerge the changes of version 5.5.0-m2.	2009-12-16 16:20:08 +01: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	WL#2360 Performance schema	2009-12-04 18:26:15 -07:00
federated	WL#2360 Performance schema	2009-12-09 20:19:51 -07:00
heap	Auto-merge from mysql-trunk.	2009-12-16 11:25:21 +03:00
ibmdb2i	Manual merge from mysql-next-mr.	2009-12-22 09:32:58 +03:00
innobase	Backporting fix for Bug#49834 from mysql-next-mr-bugfixing	2009-12-23 15:03:51 +03:00
myisam	Manual merge from mysql-trunk.	2009-12-24 10:12:07 +03:00
myisammrg	Auto-merge from mysql-trunk.	2009-12-16 11:25:21 +03:00
ndb	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw	2009-11-30 14:34:39 +02: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