From: Alexander Nozdrin
Date: November 12 2010 10:13am
Subject: bzr commit into mysql-next-mr branch (alexander.nozdrin:3382)
List-Archive: http://lists.mysql.com/commits/123698
Message-Id: <201011121013.oACADWes022543@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3619390355095941770=="

--===============3619390355095941770==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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;


--===============3619390355095941770==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/alexander.nozdrin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alexander.nozdrin@stripped\
#   ima1fz3u4f2te2j7
# target_branch: file:///home/alik/MySQL/bzr/00.build/mysql-next-mr-\
#   bugfixing/
# testament_sha1: 29ef8edcf48a58518a56f2de468fa2280e2c5d0e
# timestamp: 2010-11-12 13:13:42 +0300
# base_revision_id: tor.didriksen@stripped\
#   wechfh3nif8dyyva
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfcXvFQAAfhfgCAQUGP//3ch
1QC////wUAR+oAD1kptZmwJKKnpkwI1NpNtSeUfqm1HoTRkDQ0HqDmAAmAAJgAAAAAcwAEwABMAA
AAABJIJR/pTJqaNGj1PU9QABoAGj1AJJAjQABTE0yGpPFMjQD1AbUqWjW7p/7QMzPF6m1uLh6RAk
OzzpZ8JXnsTGTDe3kpGHLFE5jGkYxS47yv5j2mbgceOHpURsRh9tCVvPdUQJ+Gmqo+4HMI8Z7RZv
6QF5xIkbJgNiZ/zcXzUii/USsTJkGSwLZxKDCIjJmDDogIg8BXKiBwiciZAuCc8GCQdHKh696Iev
uOV3qYIGOVCAiUXAeMA4HF8gIITAMPg8RKF2XvrABwfiv7nBbSG2N7zlcSKximys7jGQHeYcDVAW
l5aA4iHiw8xNdpkLTJyLcgOIHfRdoOW/CYFZZeqORyQYqtxnCSvPBbnwBwKsWYvDbUcQM/mn4mGZ
I0vGN7Miumo0KVw9OH/Acud9pUnvLzZuhx23wgsTYq+BxvCX2GeUFzpuJnMLNDfGq8cFdQQVJaeh
350fYjhdkQLWiBi4gDiEdLOLxqrwZjYqvvssTVZX8DIjecjIdSWoakddXfA2sU7DbTvKCsmUWGsD
AJmuIxhvDOFRTWYde0zgW30uhm5a45RaS1crqHg1DRU0UUtSpG30XbIgdjZPGMvzPaBEFneLMmZv
diGJWTaY2JiajEmXpLJQzDIj4aYkhQ4QFgB4eJ02HHnCG+j+3YSu+FGrCKLApxSnxK0wj5cISqTY
IpkSmWzZsKTm1ERcXEJfXfBHjHQ6Sgz69+sUm8fiKdc22oi09OJRNYJeQlglkYlVDQZNWZ3dNaEg
oHUwRM+mZjtqUiMruWakopfHUtXMQ376LQA60jiy3E5DzyA5nMl9TD0tWuJeZHCRYzsCaIDbTL5p
0djslLJdWizLYyv6aPWdbg0JoPSHVwvY+KAGo8DycjmIxkimivIDXuLE3J+fXuiqeprNdF7HmTXf
k47DzoBp8sRUO8zccQLzyyTdwrHKJcjKw7FxlvvRoUKpKKmnsFUBUs8xHoivs+93NLZQ6WFfIjoM
qT6MIb5DTuA5y46SVyO413LcM4vCdHaUaIHs4xxJdQhqFokwfsUGwNfcWllwaRJwMDuOafUSUXjp
AQgu2znEjUkfNjNQQOA+RN6GEPSkNRAb1W1yCYosAys68MNxIiCZLk8gsBJiIVpaqMfrYg6LTxNH
CvK5owKyiNT0iOa+2KUnTi0rs7J51ACtGpBHabzGl1TvqUk3YhUzKyCrz82ZOSMKa/Qyg6NEJLLX
ywW3QohhwtsNSyb7IdFA53tr8Yejef1m+ZREiEF8wHYGHEqNwbCrfGOJNLm96tRcBJgl1A/Q2fPo
Unqx43Xqtai15nJYW1lFAh7Cg5ipSmrlSBZT5Gl0XCK1kS/8XckU4UJD3F7xUA==


--===============3619390355095941770==--