Merge branch 'merge-xtradb-5.5' into 5.5

storage/xtradb/btr/btr0btr.c

storage/xtradb/dict/dict0crea.c

storage/xtradb/fsp/fsp0fsp.c

storage/xtradb/handler/i_s.cc

storage/xtradb/include/btr0cur.h

storage/xtradb/include/btr0sea.h

storage/xtradb/include/buf0buddy.ic

storage/xtradb/include/buf0buf.h

storage/xtradb/include/dict0dict.h

storage/xtradb/include/dyn0dyn.h

storage/xtradb/include/dyn0dyn.ic

storage/xtradb/include/log0online.h

storage/xtradb/include/mach0data.h

storage/xtradb/include/mtr0mtr.h

storage/xtradb/include/os0file.h

storage/xtradb/include/page0page.h

storage/xtradb/include/page0zip.h

storage/xtradb/include/rem0rec.h

storage/xtradb/include/row0upd.h

storage/xtradb/include/trx0trx.h