From: Christopher Powers
Date: November 30 2010 3:44pm
Subject: bzr push into mysql-5.1-bugteam branch (chris.powers:3526 to 3527) Bug#35333
List-Archive: http://lists.mysql.com/commits/125520
X-Bug: 35333
Message-Id: <20101130154434.181D71DB031E@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5340600358938341141=="

--===============5340600358938341141==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

IDM1MjcgQ2hyaXN0b3BoZXIgUG93ZXJzCTIwMTAtMTEtMzAKICAgICAgQnVnIzM1MzMzLCAiSWYg
RmVkZXJhdGVkIHRhYmxlIGNhbid0IGNvbm5lY3QgdG8gcmVtb3RlIGhvc3QsIGNhbid0IHJldHJp
ZXZlIG1ldGFkYXRhIgogICAgIEAgbXlzcWwtdGVzdC9yL3Nob3dfY2hlY2sucmVzdWx0CiAgICAg
ICAgRml4ZWQgY29ycnVwdGVkIHJlc3VsdCBmaWxlCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3Fs
LXRlc3Qvci9zaG93X2NoZWNrLnJlc3VsdAogMzUyNiBDaHJpc3RvcGhlciBQb3dlcnMJMjAxMC0x
MS0yOQogICAgICBCdWcjMzUzMzMsICJJZiBGZWRlcmF0ZWQgdGFibGUgY2FuJ3QgY29ubmVjdCB0
byByZW1vdGUgaG9zdCwgY2FuJ3QgcmV0cmlldmUKICAgICAgbWV0YWRhdGEiCiAgICAgICAgICAg
ICAgICAgIAogICAgICBJbXByb3ZlZCBlcnJvciBoYW5kbGluZyBzdWNoIHRoYXQgcXVlcmllcyBh
Z2FpbnN0IEluZm9ybWF0aW9uX1NjaGVtYS5UYWJsZXMgd29uJ3QKICAgICAgZmFpbCBpZiBhIGZl
ZGVyYXRlZCB0YWJsZSBjYW4ndCBtYWtlIGEgcmVtb3RlIGNvbm5lY3Rpb24uCiAgICAgQCBteXNx
bC10ZXN0L3IvbWVyZ2UucmVzdWx0CiAgICAgICAgVXBkYXRlZCB3aXRoIHdhcm5pbmdzIHRoYXQg
d2VyZSBwcmV2aW91c2x5IG1hc2tlZC4KICAgICBAIG15c3FsLXRlc3Qvci9zaG93X2NoZWNrLnJl
c3VsdAogICAgICAgIFVwZGF0ZWQgd2l0aCB3YXJuaW5ncyB0aGF0IHdlcmUgcHJldmlvdXNseSBt
YXNrZWQuCiAgICAgQCBteXNxbC10ZXN0L3Ivdmlldy5yZXN1bHQKICAgICAgICBVcGRhdGVkIHdp
dGggd2FybmluZ3MgdGhhdCB3ZXJlIHByZXZpb3VzbHkgbWFza2VkLgogICAgIEAgc3FsL3NxbF9z
aG93LmNjCiAgICAgICAgSWYgZ2V0X3NjaGVtYV90YWJsZXNfcmVjb3JkKCkgZW5jb3VudGVycyBh
biBlcnJvciwgcHVzaCBhIHdhcm5pbmcsCiAgICAgICAgc2V0IHRoZSBUQUJMRSBDT01NRU5UIGNv
bHVtbiB3aXRoIHRoZSBlcnJvciB0ZXh0LCBhbmQgY2xlYXIgdGhlCiAgICAgICAgZXJyb3Igc28g
dGhhdCB0aGUgb3BlcmF0aW9uIGNhbiBjb250aW51ZS4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9mZWRlcmF0ZWQvZmVkZXJhdGVkX2J1Z18zNTMzMy5yZXN1bHQKICAgICAgbXlz
cWwtdGVzdC9zdWl0ZS9mZWRlcmF0ZWQvZmVkZXJhdGVkX2J1Z18zNTMzMy50ZXN0CiAgICBtb2Rp
ZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL21lcmdlLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Iv
c2hvd19jaGVjay5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL3ZpZXcucmVzdWx0CiAgICAgIHNx
bC9zcWxfc2hvdy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3Nob3dfY2hlY2su
cmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMC0xMS0zMCAw
NDo0Njo0MyArMDAwMAorKysgYi9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAxMC0x
MS0zMCAxNTo0Mzo1MCArMDAwMApAQCAtMTE5OCw3ICsxMTk4LDcgQEAgc2V0IG5hbWVzIGtvaThy
OwogRFJPUCBEQVRBQkFTRSBJRiBFWElTVFMgbXlzcWx0ZXN0MTsKIENSRUFURSBEQVRBQkFTRSBt
eXNxbHRlc3QxOwogdXNlIG15c3FsdGVzdDE7Ci1DUkVBVEUgVEFCTEUgdDEo77+977+977+977+9
77+977+977+9MSBJTlQpOworQ1JFQVRFIFRBQkxFIHQxKO+/ve+/ve+/ve+/vSBJTlQpOwogCiAt
LS0+IER1bXBpbmcgbXlzcWx0ZXN0MSB0byBvdXRmaWxlMQogCkBAIC0xMjEwLDcgKzEyMTAsNyBA
QCBEUk9QIERBVEFCQVNFIG15c3FsdGVzdDE7CiBTSE9XIENSRUFURSBUQUJMRSBteXNxbHRlc3Qx
LnQxOwogVGFibGUJQ3JlYXRlIFRhYmxlCiB0MQlDUkVBVEUgVEFCTEUgYHQxYCAoCi0gIGDvv73v
v73vv73vv73vv73vv73vv70xYCBpbnQoMTEpIERFRkFVTFQgTlVMTAorICBg77+977+977+977+9
YCBpbnQoMTEpIERFRkFVTFQgTlVMTAogKSBFTkdJTkU9TXlJU0FNIERFRkFVTFQgQ0hBUlNFVD1s
YXRpbjEKIERST1AgREFUQUJBU0UgbXlzcWx0ZXN0MTsKIHVzZSB0ZXN0OwpAQCAtMTQxNywxNCAr
MTQxNywxNCBAQCBEUk9QIFBST0NFRFVSRSBJRiBFWElTVFMgcDE7CiBEUk9QIEZVTkNUSU9OIElG
IEVYSVNUUyBmMTsKIERST1AgVEFCTEUgSUYgRVhJU1RTIHQxOwogRFJPUCBFVkVOVCBJRiBFWElT
VFMgZXYxOwotQ1JFQVRFIFZJRVcgdjEgQVMgU0VMRUNUICfvv73vv73vv73vv70nIEFTIHRlc3Q7
Ci1DUkVBVEUgUFJPQ0VEVVJFIHAxKCkgU0VMRUNUICfvv73vv73vv73vv70nIEFTIHRlc3Q7Ci1D
UkVBVEUgRlVOQ1RJT04gZjEoKSBSRVRVUk5TIENIQVIoMTApIFJFVFVSTiAn77+977+977+977+9
JzsKK0NSRUFURSBWSUVXIHYxIEFTIFNFTEVDVCAn77+977+9JyBBUyB0ZXN0OworQ1JFQVRFIFBS
T0NFRFVSRSBwMSgpIFNFTEVDVCAn77+977+9JyBBUyB0ZXN0OworQ1JFQVRFIEZVTkNUSU9OIGYx
KCkgUkVUVVJOUyBDSEFSKDEwKSBSRVRVUk4gJ++/ve+/vSc7CiBDUkVBVEUgVEFCTEUgdDEoYzEg
Q0hBUigxMCkpOwogQ1JFQVRFIFRSSUdHRVIgdDFfYmkgQkVGT1JFIElOU0VSVCBPTiB0MQogRk9S
IEVBQ0ggUk9XCi1TRVQgTkVXLmMxID0gJ++/ve+/ve+/ve+/vSc7Ci1DUkVBVEUgRVZFTlQgZXYx
IE9OIFNDSEVEVUxFIEFUICcyMDMwLTAxLTAxIDAwOjAwOjAwJyBETyBTRUxFQ1QgJ++/ve+/ve+/
ve+/vScgQVMgdGVzdDsKK1NFVCBORVcuYzEgPSAn77+977+9JzsKK0NSRUFURSBFVkVOVCBldjEg
T04gU0NIRURVTEUgQVQgJzIwMzAtMDEtMDEgMDA6MDA6MDAnIERPIFNFTEVDVCAn77+977+9JyBB
UyB0ZXN0Owogc2V0IG5hbWVzIHV0Zjg7CiBTSE9XIENSRUFURSBWSUVXIHYxOwogVmlldwlDcmVh
dGUgVmlldwljaGFyYWN0ZXJfc2V0X2NsaWVudAljb2xsYXRpb25fY29ubmVjdGlvbgoK

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/base_mysql-5.1-bugteam/
# testament_sha1: 4f394ab04a546cd835efa8d09469e3d370a31b8e
# timestamp: 2010-11-30 09:44:33 -0600
# base_revision_id: chris.powers@stripped\
#   1roji9czbd6md82s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR55mGYAAeDfhkAQWOf//39l
34D////wIg2MAFAEja3pHLzbl7Goe62GSEaGphTaYmIap+pgJqMZT01GmgNAHqADSZGqn5TZTTJq
D0htQ0AAADQAHqAAZCNKnpMTMo9QNDTTTQAAGg0HqAAaDFIZKeyj1R6j1PUANDTQaAHqaAB6gAAS
SAiYCp+JNNDTUGmhiGgAADTRoBxntr0oFe3x9SUNQ29FsJZXXKSFLgXWxYRakp6wOq+CnlEiIR3Q
nAqiwREFhLKWoLPJ0d4USGidvipZh1RoCNUoq4Dg4WYcyrHG4ju201xnmzTnoLBA5LpIG9OzgTDn
15dgOlT2IcWMyiovBSMgdeSzXUluC5flGLAMagRbqoLgtjbbj8c2gxZuDhbCSLCReRTI56SJsLSB
KpJ8ALFbOKKSeD4cnPIZhFAiaaYtah5CIbj6Dc2kSKopXLjWIn3oJZAFoxECdP15o530phh5a86w
RVcJr5n42gjC+18hhgR1WRAokUVFoHgEOGKEgQbr54sl0Yjrwx0WKOYMLil6YYRzwsgQ2Dlm4aaf
awP2LowRooZpGhwZxgI4uuSe5zUxcpi9GdYaaK6zQuhbLlbNb7kFoTFQGEdRhbgFKsKXPbRFbJuW
WdoqOlOcqRO2BShQmIOCy99MTEdM4Yx1x4zhHFEogK874YJTvIU1gwPgqaglAyICgUKtizoTqxC6
SXgsCwYoANdRWxGsifWvtUzTXGwnleV1cjY4hSKRotdpdc++CKHtDDNpjxgUwRkY5MCnAa5WXsCQ
rxBMpfhqkQ0OvLwkjfteRYRbRdQSXhLe6nc7SJj0tmEg7YEYmIh7Dc8bYH1ThR6SiglAPSWTK3Xg
RiNIN6Nkk7TRgvrIggMW3nANBk6S0WSJRRGJVGGb7yM2OpGne4HIbd87jZQ7jIB39o2M6geYO+Dv
5EjguCXwBcJg0DkDwfnhiD8mAjaNzFrwafOVCDXt34gO7hIwvOM+omjvzTjilwxq9PdZbzIlA4ik
Z34yqRNyRckRsI5gwX6dWWUasMFkdkIb1C1BKVtymEYZ0DCvqC4wMsAOJ7I1u9SDRg8ntBhXdw+q
LCKpz0OrEiog0CZk6iKfZY8E7IbcnSt+adHolvUpk+6pTtNhQ9FVUitWDzAG660NISIFEzsUAws9
GI5W9YqmN1j4ojGvRpcpNGUKCxS6dCFeTElQGoFqyKtxifIyPEjjsvE2NY73heYc3MDShtNQnl3g
Cub/lu5xxCpIxBr9rPLvwnEBpBxk5QaQLMAMArAcA7Gs/hDhvvEZIQLMtvCmFZXwYiJteuBdoIWl
e+27RhKRxpjZOBIKHPDXBxHvJ76UMyZbbrWuvTBmCkFznkupIYJqGb122WNj0eqKRjHfB2bMDyZr
UvEka5MYiq0LLVw+N6rSVbrZIatDV8DiJThWC4RVJ/IEcITQlWjgDEM4kJhInpDncYDY6SD+GQ1Q
AleYtmTvIvGUgM0AFBRjmeN1NJb1ClVzULsvKGhWhNHmplNPl1iyClE9cRkFsCLpvmLHI01A6JV+
yTXoJjjaxuQEDsMBNYIDIWOWElUqlyriVusJmKou/R0o/hz9X9CJ/T+IxkXyP8XckU4UJAeeZhmA


--===============5340600358938341141==--