mariadb/storage
Vasil Dimov 63e381e98d Merge mysql-5.1 -> mysql-5.5
I manually checked that all the conflicting InnoDB changes are in 5.5 already.
Two things I am not sure about - I commented them with XXX in this patch.
I will further check with the authors of the changesets whether these things
should be present or not.
2011-11-18 13:57:10 +02:00
..
archive bug#11758979 - 51252: ARCHIVE TABLES STILL FAIL UNDER STRESS 2011-10-21 16:19:58 +05:30
blackhole Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00
csv Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00
example Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00
federated Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGIN 2011-09-05 14:38:20 +02:00
heap Bug#11759349 -- Merge of patch from mysql-5.1. 2011-09-27 17:44:31 +05:30
innobase Merge mysql-5.1 -> mysql-5.5 2011-11-18 13:57:10 +02:00
myisam Merge. 2011-10-21 09:35:07 +04:00
myisammrg Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00
ndb Merge from mysql-5.5.14-release 2011-07-06 01:13:50 +02:00
perfschema Merging into mysql-5.5.16-release. 2011-08-15 20:12:11 +02:00