From: Bjorn Munch
Date: November 19 2010 10:41am
Subject: bzr commit into mysql-trunk-bugfixing branch (bjorn.munch:3363)
List-Archive: http://lists.mysql.com/commits/124411
Message-Id: <201011191041.oAJAfWjZ017312@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0273956423=="

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

#At file:///home/bm136801/my/merge-tr/ based on revid:bjorn.munch@stripped

 3363 Bjorn Munch	2010-11-19
      merge mistake

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-19 10:36:56 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-19 10:41:26 +0000
@@ -207,7 +207,7 @@ while($i)
 {
   --let $flags=--start-position=$start_pos
 
-  if(`SELECT $i=2`)
+  if($i==2)
   {
     --let $flags= $flags --base64-output=decode-rows -v
   }


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/merge-tr/
# testament_sha1: 69b18c6488b7f128aa5f5293c48a7391dad0ee4d
# timestamp: 2010-11-19 11:41:32 +0100
# source_branch: file:///home/bm136801/my/mtr-tr/
# base_revision_id: bjorn.munch@stripped\
#   fv0e59guk9jv7f27
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa6LyroAAW3fgAAQVGP/91IC
AAC////wUAM6j3GbvXTurrCUk0KHk8mlPMiYU9MgammRoGGiJoBkaYp6gNDQAAAJJCM0p6p6GCp5
qjR6mh6anqDIAbUqZpp6p6BQ/UnpqND1PSA9QAAkpMqfqm9NCnhMmp+kmnqbSPUADTTw1m3fsxx4
8FnPOoGWmcdJQqz8Ok2Zjv5r0lewPBodpeXT+t1jZ9KQntZYy27RIlIY9G1YTHYQuRFo+OqHoPfJ
U4VkkOkXK0Jy3zuRkMzcalcYCLkj29y8gRCLCahw+2KpUdUV/j+08o6CwFJznAR13iNjd43CJHGd
CwidIGAqvCObNMdfU9H6D3nn0qCkMQ2VsItoHmbDUFcoFtnLBwpZre2xgMpMj+F1EoTK0i+UYour
suSTs0Qt1oWEi6dpJJBEYiKBQKxnhLOQNQMIc9G02TQu/GV4FcxtpXTalJVCQ1B05SnoBPY8ag5M
hwTBLWksLB3xBYChinixwwBIvsDGFC2onFeLhLCqgtMCk4150tdZ6veCgRgZ4aSHHH1W5bsrLCCP
DKNmlaO6ROCabXlAvo3LqfPZ+WcWPLp5d/p1SOuLEw+JNqoqaiS5wa5O3HE3PDC40xHk2YeKRwGS
tjBtjolszmQgkxnljTkPrJCqrXaGBiKi7QE2rvR9diWh+4rgIfJmQagtvgujva6zPY85EBqCgkaa
tKZV+qxQJfFfgXm+SedMN1W+BExgR6QMnW+fODXK4XW5dj2S0ZvzAmXJly1y1MttoyBsVQIqMsjF
Wx2JVt42FxMaY8/8uiMz4SrZweaIU8UcIlwQnoScX3msEU6j9RXlTSPRYu8NneFC3Bm03B7WqXWS
8uuqIdS5JXsit8yxDPEpCkKZg0DIWcEhhPfR0hqIsEyZHeOuGNUIL0Ba51vFgTMmT2uwKCVLVWo5
RNYmLbqiQoRbcCeHm45pGgQXQF+knKuGGS7PTd1mWxiKiq70pY1S3o3c61ZwL8ICr6r1Ew4q3aJD
yw9fcR2Hn2ZUxlkb076A018rerc6omzhRtBe/W441RKaPxQGe7Q7sk1zzngpJWE2pYsm0Pk7f7MF
SziOVxMvAnV4cCJTOJy5DVaS8iq3ZtfXEi8/xdyRThQkK6LyroA=


--===============0273956423==--