From: marko.makela
Date: May 12 2010 6:10am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3459 to 3461)
List-Archive: http://lists.mysql.com/commits/108069
Message-Id: <201005120610.o4C67rXO010376@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0264687988=="

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

IDM0NjEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMgogICAgICBEb2N1bWVudCByZWNlbnQgZml4
ZXMgaW4gQ2hhbmdlTG9nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vQ2hhbmdlTG9nCiAzNDYwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgcm93X21l
cmdlX2Ryb3BfdGVtcF9pbmRleGVzKCk6IERvIG5vdCByZWZlcmVuY2UgZnJlZWQgbWVtb3J5Lgog
ICAgICAoQnVnICM1MzQ3MSkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL3Jvdy9yb3cwbWVyZ2UuYwogMzQ1OSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTExCiAgICAg
IEZpeCBzeXNfdmFycy50eF9pc29sYXRpb25fZnVuYy50ZXN0LCB3aGljaCB3YXMgYnJva2VuIGlu
IHJldm5vIDM0MzIKICAgICAgd2hlbiBtYWtpbmcgUkVBRCBVTkNPTU1JVFRFRCBsb2NrIGFzIGxp
dHRsZSBhcyBSRUFEIENPTU1JVFRFRC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9z
dWl0ZS9zeXNfdmFycy9yL3R4X2lzb2xhdGlvbl9mdW5jLnJlc3VsdAogICAgICBteXNxbC10ZXN0
L3N1aXRlL3N5c192YXJzL3QvdHhfaXNvbGF0aW9uX2Z1bmMudGVzdAo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL0NoYW5nZUxvZwkyMDEwLTA1LTA1IDExOjUwOjExICswMDAwCisrKyBiL3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNS0xMiAwNjowOToyMiArMDAwMApAQCAtMSwz
ICsxLDE5IEBACisyMDEwLTA1LTEyCVRoZSBJbm5vREIgVGVhbQorCisJKiByb3cvcm93MG1lcmdl
LmM6CisJRml4IEJ1ZyM1MzQ3MSByb3dfbWVyZ2VfZHJvcF90ZW1wX2luZGV4ZXMoKSByZWZlcnMg
ZnJlZWQgbWVtb3J5LCBTRUdWcworCisyMDEwLTA1LTExCVRoZSBJbm5vREIgVGVhbQorCisJKiBt
eXNxbC10ZXN0L2lubm9kYl9idWc1MzI5MC50ZXN0LCBteXNxbC10ZXN0L2lubm9kYl9idWc1MzI5
MC5yZXN1bHQsCisJaW5jbHVkZS9yZW0wY21wLmgsIHJlbS9yZW0wY21wLmMsIHJvdy9yb3cwbWVy
Z2UuYzoKKwlGaXggQnVnIzUzMjkwIHdyb25nIGR1cGxpY2F0ZSBrZXkgZXJyb3Igd2hlbiBhZGRp
bmcgYSB1bmlxdWUgaW5kZXgKKwl2aWEgZmFzdCBhbHRlciB0YWJsZQorCisyMDEwLTA1LTExCVRo
ZSBJbm5vREIgVGVhbQorCSogYnVmL2J1ZjBscnUuYywgaW5jbHVkZS9idWYwYnVmLmljOgorCUZp
eCBCdWcjNTMzMDcgdmFsZ3JpbmQ6IHdhcm5pbmdzIGluIG1haW4ucGFydGl0aW9uX2lubm9kYl9w
bHVnaW4KKwogMjAxMC0wNS0wNQlUaGUgSW5ub0RCIFRlYW0KIAogCSogcm93L3JvdzBtZXJnZS5j
OgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdl
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMJMjAxMC0wNS0w
NSAxMjozOTowMSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJn
ZS5jCTIwMTAtMDUtMTIgMDU6Mzk6MjUgKzAwMDAKQEAgLTIwOTYsOSArMjA5NiwxMiBAQCByb3df
bWVyZ2VfZHJvcF90ZW1wX2luZGV4ZXModm9pZCkKIAogCQlpZiAodGFibGUpIHsKIAkJCWRpY3Rf
aW5kZXhfdCoJaW5kZXg7CisJCQlkaWN0X2luZGV4X3QqCW5leHRfaW5kZXg7CiAKIAkJCWZvciAo
aW5kZXggPSBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0YWJsZSk7Ci0JCQkgICAgIGluZGV4
OyBpbmRleCA9IGRpY3RfdGFibGVfZ2V0X25leHRfaW5kZXgoaW5kZXgpKSB7CisJCQkgICAgIGlu
ZGV4OyBpbmRleCA9IG5leHRfaW5kZXgpIHsKKworCQkJCW5leHRfaW5kZXggPSBkaWN0X3RhYmxl
X2dldF9uZXh0X2luZGV4KGluZGV4KTsKIAogCQkJCWlmICgqaW5kZXgtPm5hbWUgPT0gVEVNUF9J
TkRFWF9QUkVGSVgpIHsKIAkJCQkJcm93X21lcmdlX2Ryb3BfaW5kZXgoaW5kZXgsIHRhYmxlLCB0
cngpOwoK

--===============0264687988==
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: 3d022b78f82505764e5b581ca3384b78101aaed4
# timestamp: 2010-05-12 09:10:10 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   lsw7seixftgzpfqt
# 
# Begin bundle
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


--===============0264687988==--