From: marko.makela
Date: January 25 2011 11:27am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3458 to 3459)
List-Archive: http://lists.mysql.com/commits/129587
Message-Id: <201101251127.p0PBR6mS000776@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1737225247=="

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

IDM0NTkgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yNQogICAgICBBZGQgc29tZSBkZWJ1ZyBhc3Nl
cnRpb25zIHRvIHVubG9ja2luZy4KICAgICAgCiAgICAgIGxvY2tfcmVjX3VubG9jaygpOiBBc3Nl
cnQgdGhhdCB0aGUgdHJhbnNhY3Rpb24gaXMgYWN0aXZlCiAgICAgIGFuZCBoYXMgbm8gd2FpdGlu
ZyBsb2NrLgogICAgICAKICAgICAgbG9ja191bmxvY2tfdGFibGVfYXV0b2luYygpOiBBc3NlcnQg
dGhhdCB0aGUgdHJhbnNhY3Rpb24gaGFzIG5vdCBiZWVuIHN0YXJ0ZWQKICAgICAgb3IgaXQgaXMg
YWN0aXZlLiBBc3NlcnQgdGhhdCBpdCBoYXMgbm8gd2FpdGluZyBsb2NrLgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMKIDM0NTggTWFya28gTcOk
a2Vsw6QJMjAxMS0wMS0yNSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNS1pbm5vZGIgdG8g
bXlzcWwtdHJ1bmstaW5ub2RiLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L210ci9tdHIwbG9nLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9s
b2NrMGxvY2suYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI1MTA1MTM1LWc3YnJwYjk0N3U5d3E1YzIK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwMTI1MTEyNzA1LWMxNnNtcWx5djJhempwYXUKQEAgLTQxNzQsOCAr
NDE3NCwxMSBAQCBsb2NrX3JlY191bmxvY2soCiAJdWxpbnQJaGVhcF9ubzsKIAlzaXplX3QJc3Rt
dF9sZW47CiAKLQl1dF9hZCh0cnggJiYgcmVjKTsKKwl1dF9hZCh0cngpOworCXV0X2FkKHJlYyk7
CiAJdXRfYWQoYmxvY2stPmZyYW1lID09IHBhZ2VfYWxpZ24ocmVjKSk7CisJdXRfYWQoIXRyeC0+
bG9jay53YWl0X2xvY2spOworCXV0X2FkKHRyeF9zdGF0ZV9lcSh0cngsIFRSWF9TVEFURV9BQ1RJ
VkUpKTsKIAogCWhlYXBfbm8gPSBwYWdlX3JlY19nZXRfaGVhcF9ubyhyZWMpOwogCkBAIC02MTE3
LDYgKzYxMjAsOSBAQCBsb2NrX3VubG9ja190YWJsZV9hdXRvaW5jKAogewogCXV0X2FkKCFsb2Nr
X211dGV4X293bigpKTsKIAl1dF9hZCghdHJ4X211dGV4X293bih0cngpKTsKKwl1dF9hZCghdHJ4
LT5sb2NrLndhaXRfbG9jayk7CisJdXRfYWQodHJ4X3N0YXRlX2VxKHRyeCwgVFJYX1NUQVRFX05P
VF9TVEFSVEVEKQorCSAgICAgIHx8IHRyeF9zdGF0ZV9lcSh0cngsIFRSWF9TVEFURV9BQ1RJVkUp
KTsKIAogCS8qIFRoaXMgZnVuY3Rpb24gaXMgaW52b2tlZCBmb3IgYSBydW5uaW5nIHRyYW5zYWN0
aW9uIGJ5IHRoZQogCXRocmVhZCB0aGF0IGlzIHNlcnZpbmcgdGhlIHRyYW5zYWN0aW9uLiBUaGVy
ZWZvcmUgaXQgaXMgbm90Cgo=

--===============1737225247==
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/mysql2a/5.6-innodb/
# testament_sha1: 7c5c389958d810c67ab13937b40c45495d776280
# timestamp: 2011-01-25 13:27:30 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   g7brpb947u9wq5c2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa0ct1gAAcTflBAwcmf//38j
nUC////0BAAIAFAEGq73Dyz3rp1q3YwkkgE1T2TTTVN4TRqn6noo0GnpNMIxDageoI1U2mpp6aj0
nqGamhoAAAAAAACSQECYjJppMggaGmmg9RkADRpoG1KanlTyT0aTQ0PQJkaNNDCGEaaMEAJJQU9l
J6YpptTag9TTT0jRoA0AaAbSaHvSouvzcxlucm+fr/JPZibDdY3C0RN7o7maD1wfpWEqprmZg8e8
q84IltgTxg0LaIR3LViV4LifWas8v5W/S5nHbMypT3KUnEkRpO+xc5rzLcObb0Icygi4k7e8/aY4
a+ozn9jJMh5fhfoR5rFPlApUyts3cdrts+uyQeTwJq4JlP0S0YOSXW3gCrDgVlDGBVTBE5hinNFF
T1qhSpzD9aBrHCOPXTtBiyzCIxVRRxBCyC68VL5wwcu1dhyfyvsWwVOlll6XdN2gvyTFzLF5t2iJ
RpNeb9rCMuKLxZEJaK1F0rnhq6260WHcKrJar1xWxIz3srFcs1pqeygXtHCOhDyUSnVSWwxttsVS
hFmma1dIlvFSs4WsgjFDpPdDcF1k1CT0acOlTHLaeY+mfREphHSZhMDwWoGgJTAROuIIRMCpyxIB
LcJSg3aCRBKJt0Qho88nwma/FQUh6S0FuLeSdIaRGBmyhEgkHzkOrKan+NdA7VimaiTq8GjYi15F
yabRKAnQ2xVC7inl3r5LBkhqs5t0nW4kaTQFcylnZMdWca0ikC4hhzn/b41CFoWxL6JFboI1Mn6V
tinBmqYIDNn8YTvT/sZ8MN+Cx3vmXP0JHD3zaO3rSNJabBQfIxIIQ5CvgvOeV/ayv0xfkYKE5UdE
M4Z6KnlMiyUbC5lwD+p/goB5s8ZH7r1X89QmKnol0ilUl0yucGEbynR1y3QU/IAewOSLUjS4Iyah
4r+TwTqmUKSb3QVekkO0GldPpmiVhJH3X5YDzgV/bNZKaYKDdK6ExdmcmzBzZ7MiE26gnPXfbQ1J
TsofbHi46ATTlaZb1pspxC9r9Y4I1BIrCa8UBDWPNNmLaYxmCFY1WjVhL4OWyh9xDiyollrTQVFC
cZsrglfHRfamaGEnBpDWDFIWwI+THjExgmSCaR24g+WsFkFIPcktsUht7Sc9F3JTZzTsTeogPCOJ
mn8haL0jckWh4kgztfMoaX8TdCEDMUYFbBqfIYOWDg5dgnSNTRmUIiyZcz99xAkXwRlhojrSJ2eL
C0ZV8JEgSrJArlFN6lmLyOEoJ8fLDkMhBEK1AiAu0leuwFJVmUj3pEhG6lUpKTEpAmWjAitMWMp6
HBxOLKAaa5+oV1PUrHPmqUQtqHa0xa1wnQOBReh0lfRfYcbIjZHQVm8exK2wLU8aayDvGg1EVTWj
2LW7LfNYlWjp7hUfoVhdVQZB5mUqCJMsAme4YUVur+JPL/F3JFOFCQrRy3WA


--===============1737225247==--