• Vasil Dimov's avatar
    Merge mysql-5.1 -> mysql-5.5 · 63e381e9
    Vasil Dimov authored
    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.
    63e381e9
ha_innodb.cc 336 KB