innobase/log/log0log.c:
  Auto merged
mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged