innobase/dict/dict0dict.c:
  merged (ul)
innobase/include/dict0dict.h:
  merged (ul)
sql/ha_innodb.cc:
  merged (ul)
sql/log.cc:
  automerged