From: marko.makela
Date: April 21 2010 10:27am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3411 to 3412) Bug#50495
List-Archive: http://lists.mysql.com/commits/106237
X-Bug: 50495
Message-Id: <201004211028.o3LAS39K014166@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1011706601=="

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

IDM0MTIgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMQogICAgICBkaWN0X2NyZWF0ZV9pbmRleF9z
dGVwKCk6IEJlIHN0cmljdCBhYm91dCBEWU5BTUlDIGFuZCBDT01QUkVTU0VEIHRhYmxlcy4KICAg
ICAgQnVnICM1MDQ5NSBpcyBhYm91dCBSRURVTkRBTlQgYW5kIENPTVBBQ1QgdGFibGVzLCBhZnRl
ciBhbGwuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi9yL2lubm9kYi16aXAucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi90L2lubm9kYi16aXAudGVzdAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5jCiAzNDExIE1hcmtv
IE3DpGtlbMOkCTIwMTAtMDQtMjEKICAgICAgaGFfaW5ub2Jhc2U6OmFkZF9pbmRleCgpOiBPbmx5
IGNoZWNrIGZvciBkdXBsaWNhdGUgaW5kZXhlcwogICAgICB3aGVuIHRoZSBkYXRhIGRpY3Rpb25h
cnkgaXMgbG9ja2VkLgogICAgICBUaGlzIGZpeGVzIGEgVU5JVl9ERUJVRyBhc3NlcnRpb24gZmFp
bHVyZSBpbiBpbm5vZGItaW5kZXgudGVzdC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwo9PT0gbW9kaWZpZWQgZmlsZSAn
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLXppcC5yZXN1bHQnCi0tLSBh
L215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYi16aXAucmVzdWx0CTIwMTAt
MDQtMjEgMDk6NDA6MzIgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3IvaW5ub2RiLXppcC5yZXN1bHQJMjAxMC0wNC0yMSAxMDoyNzoyMyArMDAwMApAQCAtMTI3LDEy
ICsxMjcsNiBAQCBDUkVBVEUgVEFCTEUgdDEoCiBjIFRFWFQgTk9UIE5VTEwsIGQgVEVYVCBOT1Qg
TlVMTCwKIFBSSU1BUlkgS0VZIChjKDc2NyksZCg3NjcpKSkKIEVOR0lORT1Jbm5vREIgUk9XX0ZP
Uk1BVD1DT01QUkVTU0VEIEtFWV9CTE9DS19TSVpFPTEgQ0hBUlNFVD1BU0NJSTsKLURST1AgVEFC
TEUgdDE7Ci1TRVQgU0VTU0lPTiBpbm5vZGJfc3RyaWN0X21vZGUgPSBvbjsKLUNSRUFURSBUQUJM
RSB0MSgKLWMgVEVYVCBOT1QgTlVMTCwgZCBURVhUIE5PVCBOVUxMLAotUFJJTUFSWSBLRVkgKGMo
NzY3KSxkKDc2NykpKQotRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPUNPTVBSRVNTRUQgS0VZX0JM
T0NLX1NJWkU9MSBDSEFSU0VUPUFTQ0lJOwogRVJST1IgNDIwMDA6IFJvdyBzaXplIHRvbyBsYXJn
ZS4gVGhlIG1heGltdW0gcm93IHNpemUgZm9yIHRoZSB1c2VkIHRhYmxlIHR5cGUsIG5vdCBjb3Vu
dGluZyBCTE9CcywgaXMgODEyNi4gWW91IGhhdmUgdG8gY2hhbmdlIHNvbWUgY29sdW1ucyB0byBU
RVhUIG9yIEJMT0JzCiBDUkVBVEUgVEFCTEUgdDEoCiBjIFRFWFQgTk9UIE5VTEwsIGQgVEVYVCBO
T1QgTlVMTCwKCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVn
aW4vdC9pbm5vZGItemlwLnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdp
bi90L2lubm9kYi16aXAudGVzdAkyMDEwLTA0LTIxIDA5OjQwOjMyICswMDAwCisrKyBiL215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYi16aXAudGVzdAkyMDEwLTA0LTIxIDEw
OjI3OjIzICswMDAwCkBAIC04NSwxNCArODUsOSBAQCBTRUxFQ1QgdGFibGVfc2NoZW1hLCB0YWJs
ZV9uYW1lLCByb3dfZm9yCiBGUk9NIGluZm9ybWF0aW9uX3NjaGVtYS50YWJsZXMgV0hFUkUgZW5n
aW5lPSdpbm5vZGInOwogZHJvcCB0YWJsZSB0MSx0MjsKIAotIyBUaGUgZm9sbG93aW5nIHNob3Vs
ZCBub3QgZmFpbCBpbiBub24tc3RyaWN0IG1vZGUuIChCdWcgIzUwOTQ1KQorIyBUaGUgZm9sbG93
aW5nIHNob3VsZCBmYWlsIGluIG5vbi1zdHJpY3QgbW9kZSB0b28uCisjIChUaGUgZml4IG9mIEJ1
ZyAjNTA5NDUgb25seSBhZmZlY3RzIFJFRFVOREFOVCBhbmQgQ09NUEFDVCB0YWJsZXMuKQogU0VU
IFNFU1NJT04gaW5ub2RiX3N0cmljdF9tb2RlID0gb2ZmOwotQ1JFQVRFIFRBQkxFIHQxKAotCWMg
VEVYVCBOT1QgTlVMTCwgZCBURVhUIE5PVCBOVUxMLAotCVBSSU1BUlkgS0VZIChjKDc2NyksZCg3
NjcpKSkKLUVOR0lORT1Jbm5vREIgUk9XX0ZPUk1BVD1DT01QUkVTU0VEIEtFWV9CTE9DS19TSVpF
PTEgQ0hBUlNFVD1BU0NJSTsKLURST1AgVEFCTEUgdDE7Ci1TRVQgU0VTU0lPTiBpbm5vZGJfc3Ry
aWN0X21vZGUgPSBvbjsKIC0tZXJyb3IgRVJfVE9PX0JJR19ST1dTSVpFCiBDUkVBVEUgVEFCTEUg
dDEoCiAJYyBURVhUIE5PVCBOVUxMLCBkIFRFWFQgTk9UIE5VTEwsCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA0LTIxIDA5OjUwOjMzICswMDAwCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNC0yMSAxMDoyNzoyMyArMDAwMApAQCAtOSw3
ICs5LDcgQEAKIAlGaXggQnVnIzUwNDk1ICdSb3cgc2l6ZSB0b28gbGFyZ2UnIGZvciBwbHVnaW4s
IGJ1dCB3b3JrcyBmb3IKIAlidWlsdC1pbiBJbm5vREIKIAlPbmx5IGNoZWNrIHRoZSByZWNvcmQg
c2l6ZSBhdCBpbmRleCBjcmVhdGlvbiB0aW1lIHdoZW4KLQlpbm5vZGJfc3RyaWN0X21vZGUgaXMg
c2V0LgorCWlubm9kYl9zdHJpY3RfbW9kZSBpcyBzZXQgb3Igd2hlbiBST1dfRk9STUFUIGlzIERZ
TkFNSUMgb3IgQ09NUFJFU1NFRC4KIAogMjAxMC0wNC0yMAlUaGUgSW5ub0RCIFRlYW0KIAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5jJwot
LS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGNyZWEuYwkyMDEwLTA0LTIwIDEx
OjQyOjIyICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9kaWN0L2RpY3QwY3JlYS5j
CTIwMTAtMDQtMjEgMTA6Mjc6MjMgKzAwMDAKQEAgLTExMDUsOCArMTEwNSwxMSBAQCBkaWN0X2Ny
ZWF0ZV9pbmRleF9zdGVwKAogCiAJCWR1bGludAlpbmRleF9pZCA9IG5vZGUtPmluZGV4LT5pZDsK
IAotCQllcnIgPSBkaWN0X2luZGV4X2FkZF90b19jYWNoZShub2RlLT50YWJsZSwgbm9kZS0+aW5k
ZXgsCi0JCQkJCSAgICAgIEZJTF9OVUxMLCB0cnhfaXNfc3RyaWN0KHRyeCkpOworCQllcnIgPSBk
aWN0X2luZGV4X2FkZF90b19jYWNoZSgKKwkJCW5vZGUtPnRhYmxlLCBub2RlLT5pbmRleCwgRklM
X05VTEwsCisJCQl0cnhfaXNfc3RyaWN0KHRyeCkKKwkJCXx8IGRpY3RfdGFibGVfZ2V0X2Zvcm1h
dChub2RlLT50YWJsZSkKKwkJCT49IERJQ1RfVEZfRk9STUFUX1pJUCk7CiAKIAkJbm9kZS0+aW5k
ZXggPSBkaWN0X2luZGV4X2dldF9pZl9pbl9jYWNoZV9sb3coaW5kZXhfaWQpOwogCQl1dF9hKCFu
b2RlLT5pbmRleCA9PSAoZXJyICE9IERCX1NVQ0NFU1MpKTsKCg==

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# testament_sha1: b274e9eb9dc502981ef0337167cd9984893ed889
# timestamp: 2010-04-21 13:27:55 +0300
# base_revision_id: marko.makela@stripped\
#   mji6lmdgvuqh96qq
# 
# Begin bundle
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


--===============1011706601==--