removed:
  plugin/innobase/include/thr0loc.h
  plugin/innobase/include/thr0loc.ic
  plugin/innobase/thr/thr0loc.cc
added:
  plugin/innobase/include/ut0bh.h
  plugin/innobase/include/ut0bh.ic
  plugin/innobase/ut/ut0bh.cc
modified:
  plugin/innobase/CMakeLists.txt
  plugin/innobase/btr/btr0btr.cc
  plugin/innobase/btr/btr0cur.cc
  plugin/innobase/btr/btr0sea.cc
  plugin/innobase/buf/buf0buddy.cc
  plugin/innobase/buf/buf0buf.cc
  plugin/innobase/buf/buf0flu.cc
  plugin/innobase/buf/buf0lru.cc
  plugin/innobase/buf/buf0rea.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/dict/dict0load.cc
  plugin/innobase/dict/dict0mem.cc
  plugin/innobase/fil/fil0fil.cc
  plugin/innobase/fsp/fsp0fsp.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/handler/handler0alter.cc
  plugin/innobase/handler/internal_dictionary.cc
  plugin/innobase/handler/replication_dictionary.cc
  plugin/innobase/handler/replication_log.cc
  plugin/innobase/ibuf/ibuf0ibuf.cc
  plugin/innobase/include/btr0btr.h
  plugin/innobase/include/btr0cur.h
  plugin/innobase/include/btr0pcur.h
  plugin/innobase/include/btr0pcur.ic
  plugin/innobase/include/btr0types.h
  plugin/innobase/include/buf0buf.h
  plugin/innobase/include/buf0flu.h
  plugin/innobase/include/buf0lru.h
  plugin/innobase/include/buf0rea.h
  plugin/innobase/include/data0data.h
  plugin/innobase/include/data0data.ic
  plugin/innobase/include/dict0dict.h
  plugin/innobase/include/dict0dict.ic
  plugin/innobase/include/dict0load.h
  plugin/innobase/include/dict0mem.h
  plugin/innobase/include/dict0types.h
  plugin/innobase/include/ha_prototypes.h
  plugin/innobase/include/ibuf0ibuf.h
  plugin/innobase/include/ibuf0ibuf.ic
  plugin/innobase/include/mem0mem.h
  plugin/innobase/include/mem0mem.ic
  plugin/innobase/include/mtr0mtr.h
  plugin/innobase/include/mtr0mtr.ic
  plugin/innobase/include/os0file.h
  plugin/innobase/include/page0page.h
  plugin/innobase/include/page0zip.h
  plugin/innobase/include/rem0cmp.h
  plugin/innobase/include/rem0cmp.ic
  plugin/innobase/include/rem0rec.h
  plugin/innobase/include/rem0rec.ic
  plugin/innobase/include/row0upd.h
  plugin/innobase/include/srv0srv.h
  plugin/innobase/include/sync0arr.h
  plugin/innobase/include/sync0rw.h
  plugin/innobase/include/sync0sync.h
  plugin/innobase/include/trx0purge.h
  plugin/innobase/include/trx0rseg.h
  plugin/innobase/include/trx0sys.h
  plugin/innobase/include/trx0sys.ic
  plugin/innobase/include/trx0trx.h
  plugin/innobase/include/univ.i
  plugin/innobase/include/ut0ut.h
  plugin/innobase/include/ut0vec.h
  plugin/innobase/include/ut0vec.ic
  plugin/innobase/lock/lock0lock.cc
  plugin/innobase/log/log0recv.cc
  plugin/innobase/mem/mem0dbg.cc
  plugin/innobase/mem/mem0mem.cc
  plugin/innobase/mtr/mtr0mtr.cc
  plugin/innobase/os/os0file.cc
  plugin/innobase/page/page0cur.cc
  plugin/innobase/page/page0page.cc
  plugin/innobase/page/page0zip.cc
  plugin/innobase/plugin.am
  plugin/innobase/rem/rem0cmp.cc
  plugin/innobase/row/row0ins.cc
  plugin/innobase/row/row0merge.cc
  plugin/innobase/row/row0mysql.cc
  plugin/innobase/row/row0purge.cc
  plugin/innobase/row/row0umod.cc
  plugin/innobase/row/row0upd.cc
  plugin/innobase/row/row0vers.cc
  plugin/innobase/srv/srv0srv.cc
  plugin/innobase/srv/srv0start.cc
  plugin/innobase/sync/sync0arr.cc
  plugin/innobase/sync/sync0rw.cc
  plugin/innobase/sync/sync0sync.cc
  plugin/innobase/trx/trx0i_s.cc
  plugin/innobase/trx/trx0purge.cc
  plugin/innobase/trx/trx0roll.cc
  plugin/innobase/trx/trx0rseg.cc
  plugin/innobase/trx/trx0sys.cc
  plugin/innobase/trx/trx0trx.cc
  plugin/innobase/ut/ut0dbg.cc
  plugin/innobase/ut/ut0ut.cc
  plugin/innobase/xtrabackup/xtrabackup.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-05-23 Merge InnoDB from MySQL 5.5.12 (no InnoDB version bump)