Post-merge fix of mysqlbinlog.{test,result}

mysql-test/r/mysqlbinlog.result

@@ -313,5 +313,6 @@ DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-flush logs;
 End of 5.0 tests
+flush logs;
+End of 5.1 tests

mysql-test/t/mysqlbinlog.test

@@ -214,7 +214,7 @@ flush logs;
 #
 flush logs;
 --error 1
---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000014 >/dev/null 2>/dev/null
+--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null
 --exec $MYSQL_BINLOG --force-if-open $MYSQLTEST_VARDIR/log/master-bin.000012 >/dev/null 2>/dev/null
 
 --echo End of 5.1 tests