innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/ha_innodb.cc:
  SCCS merged
sql/sql_class.cc:
  SCCS merged