From: marko.makela
Date: May 11 2010 10:49am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3457) Bug#52964
List-Archive: http://lists.mysql.com/commits/107940
X-Bug: 52964
Message-Id: <201005111049.o4BAnMXJ006211@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1064584593=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTExMTA0NTAwLWM2a3pk
MGJnNXM0MnA4ZTkKCiAzNDU3IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTEKICAgICAgYnRyX3Bh
Z2Vfc3BsaXRfYW5kX2luc2VydCgpOiBBZGQgYW4gYXNzZXJ0aW9uCiAgICAgIHN1Z2dlc3RlZCBi
eSBTdW5ueSBCYWlucyB3aGVuIHJldmlld2luZyBCdWcgIzUyOTY0LgoKICAgIG1vZGlmaWVkOgog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBidHIuYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDUtMDQgMTA6NTU6NDYgKzAwMDAKKysrIGIv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJMjAxMC0wNS0xMSAxMDo0OToxMCAr
MDAwMApAQCAtMjAwMCw2ICsyMDAwLDcgQEAgZnVuY19zdGFydDoKIAkJCWdvdG8gaW5zZXJ0X2Vt
cHR5OwogCQl9CiAJfSBlbHNlIGlmIChVTklWX1VOTElLRUxZKGluc2VydF9sZWZ0KSkgeworCQl1
dF9hKG5faXRlcmF0aW9ucyA+IDApOwogCQlmaXJzdF9yZWMgPSBwYWdlX3JlY19nZXRfbmV4dChw
YWdlX2dldF9pbmZpbXVtX3JlYyhwYWdlKSk7CiAJCW1vdmVfbGltaXQgPSBwYWdlX3JlY19nZXRf
bmV4dChidHJfY3VyX2dldF9yZWMoY3Vyc29yKSk7CiAJfSBlbHNlIHsKCg==

--===============1064584593==
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: 78964adaa4c0a8a13636f8eb871af272f6fc900a
# timestamp: 2010-05-11 13:49:18 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   c6kzd0bg5s42p8e9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWagSAxwAAadfgEAwW2P//3MC
CAC/7//wUAO03nVqbdRvedeoSSmminhE8SemKn4qPNGqb1TDJNPIjEEkpkaZT0xTIU/UymR6mJoG
h6g0DQSRNFNpDVPRtT1I2pvRTTyQ/VHqD9UZA9BlImJpkwmEMmjTQwTTCBoASUKeIpsCnpPT0UBp
tQBoeoANMnOpW3Lqbp4McXKAyi2ujXOAjLVzOv6fLKWZSzMxOPkvZ8c0BrxhZ3tu+e2uDlqZubvW
oezm92ib1YU1H2253WktbqHt3aAQV1OQZG5ylOnPq/Bv546T2qKMR0XCaxRqOq2+7ymLBiOpcEjA
F1mO+PqiyYmZlpE9stTp9wPSGCOROLhg9PQNEMgpxpo2FY6Js2vVqy8VIvLRbpJWiKUFVJQ5BWgt
yitRF7ZrpnHMZmw+qrXdi0C5cBjy22W+KYRqOqP+ha8yk48FmaPCrVmzNEFiwrjPWMB5cpESBgoF
kJ5oDXMPBOCLla2APGHijMNygN+qTsPq9RvOVyDs4Vd3KmVoVlFI0kFFjzVNdG6ysk24wW9UMEx/
tBNSK3L84rbIvlvVIl6ntbiKGK09Ca7AoY4THHqXuFj6c1QWNidjs7R7TAqVWb1aL9iY2KNRaFLV
V8mbwzKMLNjXcbbyw5QTjJl4cjLdLQ5TF5RcsUicXMmH8md6GwZUoTplDWhU3TupiQ+9AWLaYEhh
gY9SRviSskTqXA71+xI8dDPfDTTjIXSSRBlD+in3rmRNTjYuIwxcteH+TkxBlRw3gxrUhmWsu9c1
oqFW8iwj3XMkNsSMsewt481tqTVRyu2Cb7UX8rmu01MO5CmX6gaFxgs9VG45FcubTkKOMOO7h1BP
g+UyMdXYaFYzF5PQmh7EGb41FTKrWMqSlKA2Eh1/GRVZAt+/jDit6UFkN4vdwrzLYXg0/7u+81Sv
xO3b4ihNd5ZcEYnkuINNctdH1jCae8BnQKwDZPfB0ixflSRkKYNYB3GbywUiREwSEFvNHK2rOSFg
ayQ5LWgdgkUOlkfusOnbppU8ecaJvtYWLd5lOgNDj8EsFJu/30gtBmQyiOJxZMkNK/x9gLQgm0I/
qRxCqxdat/6VvdwbDC9VREgd4pZ9skg3R+y6hBammSWLqXipm0gnZSpSgKxVlcEwhiE66jJesU5j
N6i+jxIqUAbBc7s8CbEAszup/x73nCdO0qzVfuMc5jhpQCKwENcmJsquaxfPOz740XSOlq2Z9iDg
3Pa+0XJ1Zfr4MzaSbH2recn0Fs0/4u5IpwoSFQJAY4A=


--===============1064584593==--