into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540


mysql-test/t/status.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  manual merge
sql/log.cc:
  manual merge