Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540

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

mysql-test/t/status.test

@@ -26,7 +26,7 @@ connection con1;
 --send
 update t1 set n = 3;
 connection con2;
-sleep 0.5;
+sleep 1;
 unlock tables;
 connection con1;
 reap;