From: marko.makela
Date: May 14 2010 1:10pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3467) Bug#48024
 Bug#53644
List-Archive: http://lists.mysql.com/commits/108331
X-Bug: 48024,53644
Message-Id: <201005141311.o4EC5GvI032453@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0818863158=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMwODE1LXltN2o3
Y2Z1ODhybzZrbTQKCiAzNDY3IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTQKICAgICAgRG9jdW1l
bnQgQnVnICM0ODAyNCBhbmQgQnVnICM1MzY0NCBpbiB0aGUgQ2hhbmdlTG9nCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZp
bGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTQx
MzA4MTUteW03ajdjZnU4OHJvNmttNAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl
TG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE0MTMxMDUwLW1raGx2bHVp
MXU1Mmlyb2IKQEAgLTEsMyArMSwxMSBAQAorMjAxMC0wNS0xNAlUaGUgSW5ub0RCIFRlYW0KKwkq
IG15c3FsLXRlc3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QsIG15c3FsLXRlc3QvaW5ub2RiX2J1ZzQ4
MDI0LnJlc3VsdCwKKwlkaWN0L2RpY3QwZGljdC5jLCBoYW5kbGVyL2hhX2lubm9kYi5jYywgaGFu
ZGxlci9oYV9pbm5vZGIuaCwKKwlpbmNsdWRlL2RpY3QwZGljdC5oLCBpbmNsdWRlL2hhX3Byb3Rv
dHlwZXMuaCwgaW5jbHVkZS9yb3cwbXlzcWwuaCwKKwlpbmNsdWRlL3RyeDB0cnguaCwgcm93L3Jv
dzBteXNxbC5jLCB0cngvdHJ4MGlfcy5jLCB0cngvdHJ4MHRyeC5jOgorCUZpeCBCdWcjNDgwMjQg
SW5ub2RiIGRvZXNuJ3Qgd29yayB3aXRoIG11bHRpLXN0YXRlbWVudHMKKwlGaXggQnVnIzUzNjQ0
IElubm9EQiB0aGlua3MgdGhhdCAvKi8gc3RhcnRzIGFuZCBlbmRzIGEgY29tbWVudAorCiAyMDEw
LTA1LTEyCVRoZSBJbm5vREIgVGVhbQogCiAJKiBoYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2M6Cgo=

--===============0818863158==
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-innodb2/
# testament_sha1: ade435bfb12b4c27a887545d623db1fadd0afc62
# timestamp: 2010-05-14 16:10:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ym7j7cfu88ro6km4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQv0uqQAAdNfgEAwW/f//18m
BAC////wUARhvHVSB2217m2OEkip+k1T2I0yE2TICantJPSGj1PUzKPUaaCUmkp7Ro0T1E8CJo0a
AAAAA0IJTamQPSaMgBkyPU9EyBpoBpowMoo9T1P1QA9T1NADTQAAAAAEkQQTCDSbRTyZKe0Kfip4
UNlPUYEepO9Y2XPP+sS/dcWs6cvqZ9GqJPGV5tVeJ/clqjcM6WQ2X8Heeak6fkg+KedzPg0OXscy
sy8antzwVfCP/daSwhfcP6Oufe/jjqxDycYcE7yBNTlwVtosK/o/La2jzSdbM8R8i/wZuxkO3Xxh
mbdxz5tRSMOZxitMhD3lEZDD3l6YqqkFMbcwCkDZIkLOKQkRAljnOoRC8CcbBAva2gRgypsTCFRr
Br8tYPoglCGlvaQKUYAvkMOHGZ7UezCgIkYQxTj+JA0GykyGXMMZMqJWwNzJFFYunj0vjMwm2FWn
4wURgKyZdgOg8jqXuTNGjNtZqhzMcsRW+jIhaZh1HiPHhy3YWJEnaKKGryDVeJI4eqIOYaiv1nJU
K0sIbSoM5uHpmNz3XRGkkZiBfA3foVnMTClp1GBiVH9LY+4kfBJq2iS1LdEVA2CSZCHQjFukoL1Y
WGbEmYVYwHLacSjEmZiKwDvkdFdebI5CBArPTeSScg4e4qTYjSk0JXkpHyla5QzjUcU2VmKVzxNu
UlMpFHPJlmLbNIwlqdULPRFGDkkiUBM5s2/tIsL3Y29+e+kieDQj4sHDwO/zhQ5Nnhgakj7EbmTH
34B+Cl95ongeoxJVA1DR8CN6bTcODQy/PynoavtJB2GJkOaRFeu3akStHDkkXRvLpK4rSy1i9q0i
iTp+/Wb2Wccdu0uBztMmvyPg3Ll/FjDD8zq5lpyuOBVIpHieBM6dFXu/ZzbBkhwepI3DoxrkX58T
QXElFNaVCqFItLgusMh3dDWWGVpNBtBYxmLKTk7bH4bDyKs5teEowbNmH3tN5tKKt/UEhfEktRVQ
XIXbbrcAiM1FmNI5GUzMAajb6DNmOK1jnWaSAxcdPfu1GnrdbFu2cdXEYYG4lIMDX9NMZRVvRMWB
uU57B3RHhQ8fPKLGnlAs2kpqtR4iOFMLgaRORgyAQ1zmew/dyWe8CBpE0AeGuHcOu4K62tu25Ikk
FkDerwK3h6owJyRplSGWkl1l1C5ADwXLeC2IkXDuOMkQYdCheCyqoUFafTZC8MiBvKch2enzc5FV
DfJ0onpUpAwwMXShBGR/+TI3gdKBQYTJ8QWCjIcX9OJ+HwHj1oVYHOaPskQC6ZcnqiJzKMyV5Syy
xUQL4a5dEcY3CHGVHTHbWiUkwlI4N+ZpdOUYyNSSAVHiXgwMcQkoIERYaSstubfEqYgM2c7NcWJF
oDTUe7UhxXU0hBtlw3x0tn2JxjzjQUfgmmhdrsLSnM6fDgQPPIFik3IkYqFDDMqnJ+4uK2WB/YcB
xRt7up45LFHNHzxAcVyqzZaWUEUSZNC2swVYIrXoYLoxeK3vKIf4u5IpwoSAX6XVIA==


--===============0818863158==--