bzr commit into mysql-next-mr branch (alexander.nozdrin:3382)

[Alexander Nozdrin]

#At file:///home/alik/MySQL/bzr/00.build/mysql-next-mr-bugfixing/ based on revid:tor.didriksen@stripped

 3382 Alexander Nozdrin	2010-11-12
      Fix rpl_conditional_comments.test. It causes rpl_events to fail first time.

    modified:
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
=== modified file 'mysql-test/suite/rpl/r/rpl_conditional_comments.result'
--- a/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2010-11-10 11:26:45 +0000
+++ b/mysql-test/suite/rpl/r/rpl_conditional_comments.result	2010-11-12 10:13:37 +0000
@@ -73,3 +73,4 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` EVENT e1 ON SCHEDULE EVERY 10 DAY DO SELECT 'abc'
 DROP TABLE t1;
+DROP EVENT e1;

=== modified file 'mysql-test/suite/rpl/t/rpl_conditional_comments.test'
--- a/mysql-test/suite/rpl/t/rpl_conditional_comments.test	2010-11-10 11:26:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_conditional_comments.test	2010-11-12 10:13:37 +0000
@@ -82,4 +82,5 @@ CREATE/*!*/EVENT e1 ON SCHEDULE EVERY 10
 source include/show_binlog_events.inc;
 
 DROP TABLE t1;
+DROP EVENT e1;
 source include/master-slave-end.inc;


Attachment: [text/bzr-bundle] bzr/[e-mail]