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

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTEwNTEzNS1nN2Jy
cGI5NDd1OXdxNWMyCgogMzQ1OSBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI1CiAgICAgIEFkZCBz
b21lIGRlYnVnIGFzc2VydGlvbnMgdG8gdW5sb2NraW5nLgogICAgICAKICAgICAgbG9ja19yZWNf
dW5sb2NrKCk6IEFzc2VydCB0aGF0IHRoZSB0cmFuc2FjdGlvbiBpcyBhY3RpdmUKICAgICAgYW5k
IGhhcyBubyB3YWl0aW5nIGxvY2suCiAgICAgIAogICAgICBsb2NrX3VubG9ja190YWJsZV9hdXRv
aW5jKCk6IEFzc2VydCB0aGF0IHRoZSB0cmFuc2FjdGlvbiBoYXMgbm90IGJlZW4gc3RhcnRlZAog
ICAgICBvciBpdCBpcyBhY3RpdmUuIEFzc2VydCB0aGF0IGl0IGhhcyBubyB3YWl0aW5nIGxvY2su
CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwo9
PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAxMjUxMDUxMzUtZzdicnBiOTQ3dTl3cTVjMgorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTAxMjUxMTI3MDUtYzE2c21xbHl2MmF6anBhdQpAQCAtNDE3NCw4ICs0MTc0LDExIEBAIGxvY2tf
cmVjX3VubG9jaygKIAl1bGludAloZWFwX25vOwogCXNpemVfdAlzdG10X2xlbjsKIAotCXV0X2Fk
KHRyeCAmJiByZWMpOworCXV0X2FkKHRyeCk7CisJdXRfYWQocmVjKTsKIAl1dF9hZChibG9jay0+
ZnJhbWUgPT0gcGFnZV9hbGlnbihyZWMpKTsKKwl1dF9hZCghdHJ4LT5sb2NrLndhaXRfbG9jayk7
CisJdXRfYWQodHJ4X3N0YXRlX2VxKHRyeCwgVFJYX1NUQVRFX0FDVElWRSkpOwogCiAJaGVhcF9u
byA9IHBhZ2VfcmVjX2dldF9oZWFwX25vKHJlYyk7CiAKQEAgLTYxMTcsNiArNjEyMCw5IEBAIGxv
Y2tfdW5sb2NrX3RhYmxlX2F1dG9pbmMoCiB7CiAJdXRfYWQoIWxvY2tfbXV0ZXhfb3duKCkpOwog
CXV0X2FkKCF0cnhfbXV0ZXhfb3duKHRyeCkpOworCXV0X2FkKCF0cngtPmxvY2sud2FpdF9sb2Nr
KTsKKwl1dF9hZCh0cnhfc3RhdGVfZXEodHJ4LCBUUlhfU1RBVEVfTk9UX1NUQVJURUQpCisJICAg
ICAgfHwgdHJ4X3N0YXRlX2VxKHRyeCwgVFJYX1NUQVRFX0FDVElWRSkpOwogCiAJLyogVGhpcyBm
dW5jdGlvbiBpcyBpbnZva2VkIGZvciBhIHJ1bm5pbmcgdHJhbnNhY3Rpb24gYnkgdGhlCiAJdGhy
ZWFkIHRoYXQgaXMgc2VydmluZyB0aGUgdHJhbnNhY3Rpb24uIFRoZXJlZm9yZSBpdCBpcyBub3QK
Cg==

--===============0833359227==
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:13 +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


--===============0833359227==--