After merge fixes

mysql-test/r/mysqlbinlog.result

@@ -233,7 +233,6 @@ call p1();
 drop procedure p1;
 call p1();
 ERROR 42000: PROCEDURE test.p1 does not exist
-
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
@@ -254,6 +253,7 @@ ROLLBACK /* added by mysqlbinlog */;
 call p1();
 1
 1
+drop procedure p1;
 flush logs;
 create table t1 (a varchar(64) character set utf8);
 load data infile '../std_data_ln/loaddata6.dat' into table t1;
@@ -312,5 +312,4 @@ DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-drop table t1, t2, t5;
 End of 5.0 tests

mysql-test/t/mysqlbinlog.test

@@ -179,7 +179,6 @@ drop procedure p1;
 --exec $MYSQL_BINLOG --version 2>&1 > /dev/null
 --exec $MYSQL_BINLOG --help 2>&1 > /dev/null
 --enable_query_log
-drop table t1, t2, t5; 
 
 #
 # Bug#15126 character_set_database is not replicated
@@ -203,6 +202,6 @@ select hex(a) from t1;
 drop table t1;
 flush logs;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000011
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009
 
 --echo End of 5.0 tests