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
..
ha_innodb.cc	Merge mysql-5.1 -> mysql-5.5	2011-11-18 13:57:10 +02:00
ha_innodb.h	Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING	2011-06-01 10:06:55 +02:00
handler0alter.cc	Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING	2011-06-01 10:06:55 +02:00
i_s.cc	Merging into mysql-5.5.16-release.	2011-08-15 20:12:11 +02:00
i_s.h	Use plugin_author also for the InnoDB SE plugin	2011-02-28 11:07:22 +02:00