From: marko.makela
Date: June 22 2010 12:03pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3516 to 3518) Bug#54686
List-Archive: http://lists.mysql.com/commits/111767
X-Bug: 54686
Message-Id: <201006221203.o5MB8NIc029752@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0060395686=="

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

IDM1MTggTWFya28gTcOka2Vsw6QJMjAxMC0wNi0yMgogICAgICBDaGFuZ2VMb2cgZm9yIEJ1ZyM1
NDY4NiAiZmllbGQtPmNvbC0+bXR5cGUgPT0gdHlwZSIgYXNzZXJ0aW9uIGVycm9yIGF0IHJvdy9y
b3cwc2VsLmMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5n
ZUxvZwogMzUxNyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIEJ1ZyM1NDY4NiAiZmll
bGQtPmNvbC0+bXR5cGUgPT0gdHlwZSIgYXNzZXJ0aW9uIGVycm9yIGF0IHJvdy9yb3cwc2VsLmMK
ICAgICAgaGFfaW5ub2Jhc2U6OmluZGV4X3JlYWQoKSwgaGFfaW5ub2Jhc2U6OnJlY29yZHNfaW5f
cmFuZ2UoKTogQ2hlY2sgdGhhdAogICAgICB0aGUgaW5kZXggaXMgdXNlYWJsZSBiZWZvcmUgaW52
b2tpbmcgcm93X3NlbF9jb252ZXJ0X215c3FsX2tleV90b19pbm5vYmFzZSgpLgogICAgICAKICAg
ICAgVGhpcyBmaXggaXMgYmFzZWQgb24gYSBzdWdnZXN0aW9uIGJ5IFlhc3VmdW1pIEtpbm9zaGl0
YS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFf
aW5ub2RiLmNjCiAzNTE2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMjEKICAgICAgQnVnIzU0NjU4
OiBBZGQgQ2hhbmdlTG9nIGVudHJ5CgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9DaGFuZ2VMb2cKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MjEwOTUxNDgtOGc3M2s4azY4ZHBqMDgwdQor
KysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBv
cmFjbGUuY29tLTIwMTAwNjIyMTE1OTQ5LXhrbjJha2tqcHB3aGhzNWMKQEAgLTEsMyArMSw5IEBA
CisyMDEwLTA2LTIyCVRoZSBJbm5vREIgVGVhbQorCisJKiBoYW5kbGVyL2hhX2lubm9kYi5jYzoK
KwlGaXggQnVnIzU0Njg2OiAiZmllbGQtPmNvbC0+bXR5cGUgPT0gdHlwZSIgYXNzZXJ0aW9uIGVy
cm9yIGF0CisJcm93L3JvdzBzZWwuYworCiAyMDEwLTA2LTIxCVRoZSBJbm5vREIgVGVhbQogCiAJ
KiBkaWN0L2RpY3QwbG9hZC5jLCBmaWwvZmlsMGZpbC5jOgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhX2lubm9kYi5jYycKLS0tIGEvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNjIxMDk1MTQ4LThnNzNrOGs2OGRwajA4MHUKKysrIGIvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2hhbmRsZXIvaGFfaW5ub2RiLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNjIyMTE1OTQ5LXhrbjJha2tqcHB3aGhzNWMKQEAgLTUzNzksNiArNTM3OSw5IEBA
IGhhX2lubm9iYXNlOjppbmRleF9yZWFkKAogCQlwcmVidWlsdC0+aW5kZXhfdXNhYmxlID0gRkFM
U0U7CiAJCURCVUdfUkVUVVJOKEhBX0VSUl9DUkFTSEVEKTsKIAl9CisJaWYgKFVOSVZfVU5MSUtF
TFkoIXByZWJ1aWx0LT5pbmRleF91c2FibGUpKSB7CisJCURCVUdfUkVUVVJOKEhBX0VSUl9UQUJM
RV9ERUZfQ0hBTkdFRCk7CisJfQogCiAJLyogTm90ZSB0aGF0IGlmIHRoZSBpbmRleCBmb3Igd2hp
Y2ggdGhlIHNlYXJjaCB0ZW1wbGF0ZSBpcyBidWlsdCBpcyBub3QKIAluZWNlc3NhcmlseSBwcmVi
dWlsdC0+aW5kZXgsIGJ1dCBjYW4gYWxzbyBiZSB0aGUgY2x1c3RlcmVkIGluZGV4ICovCkBAIC03
MjIxLDYgKzcyMjQsMTAgQEAgaGFfaW5ub2Jhc2U6OnJlY29yZHNfaW5fcmFuZ2UoCiAJCW5fcm93
cyA9IEhBX1BPU19FUlJPUjsKIAkJZ290byBmdW5jX2V4aXQ7CiAJfQorCWlmIChVTklWX1VOTElL
RUxZKCFyb3dfbWVyZ2VfaXNfaW5kZXhfdXNhYmxlKHByZWJ1aWx0LT50cngsIGluZGV4KSkpIHsK
KwkJbl9yb3dzID0gSEFfRVJSX1RBQkxFX0RFRl9DSEFOR0VEOworCQlnb3RvIGZ1bmNfZXhpdDsK
Kwl9CiAKIAloZWFwID0gbWVtX2hlYXBfY3JlYXRlKDIgKiAoa2V5LT5rZXlfcGFydHMgKiBzaXpl
b2YoZGZpZWxkX3QpCiAJCQkJICAgICsgc2l6ZW9mKGR0dXBsZV90KSkpOwoK

--===============0060395686==
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.1-innodb/
# testament_sha1: e4d80f74eb5f7b9aa098dddeaeafe34159903322
# timestamp: 2010-06-22 15:03:14 +0300
# base_revision_id: marko.makela@stripped\
#   8g73k8k68dpj080u
# 
# Begin bundle
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


--===============0060395686==--