From: marko.makela
Date: September 9 2010 10:48am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3175)
List-Archive: http://lists.mysql.com/commits/117830
Message-Id: <201009091048.o899NwEj008131@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1073895158=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDkwOTEwNDQwNC1qZm1k
M2hndHF6NnVqdmE5CgogMzE3NSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA5LTA5CiAgICAgIGlidWZf
aW5zZXJ0X3RvX2luZGV4X3BhZ2UoKTogUmVtb3ZlIGJvZ3VzIGNvZGUgYWRkZWQgZm9yIGRlbGV0
ZSBidWZmZXJpbmcuCiAgICAgIEluIGVhcmx5IGRldmVsb3BtZW50IG9mIGRlbGV0ZSBidWZmZXJp
bmcsIHdlIGRpZCBhbGxvdyBCLXRyZWUgcGFnZXMKICAgICAgdG8gYmVjb21lIGVtcHR5IGFzIGEg
cmVzdWx0IG9mIGJ1ZmZlcmVkIGRlbGV0ZXMuIFRoYXQgY2F1c2VkIGZ1bmRhbWVudGFsCiAgICAg
IHByb2JsZW1zLiBUaGUgZml4IHdhcyB0byByZWZ1c2UgYnVmZmVyaW5nIHB1cmdlIG9wZXJhdGlv
bnMgdW5sZXNzCiAgICAgIHRoZSBwYWdlIGNhbiBiZSBndWFyYW50ZWVkIHRvIGJlIG5vbmVtcHR5
LiBSZW1vdmUgYW4gYXR0ZW1wdCB0bwogICAgICBjb3BlIHdpdGggZW1wdHkgcGFnZXMgd2hlbiBt
ZXJnaW5nIGluc2VydHMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaWJ1
Zi9pYnVmMGlidWYuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pYnVmL2li
dWYwaWJ1Zi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5MDkxMDQ0MDQtamZtZDNoZ3RxejZ1anZhOQor
KysgYi9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDA5MDkxMDQ4MDAtcnIyN3B6czZybnF2d2MyOQpAQCAtMzc3OSwxNyAr
Mzc3OSwxMSBAQCBpYnVmX2luc2VydF90b19pbmRleF9wYWdlKAogCXJlYyA9IHBhZ2VfcmVjX2dl
dF9uZXh0KHBhZ2VfZ2V0X2luZmltdW1fcmVjKHBhZ2UpKTsKIAogCWlmIChwYWdlX3JlY19pc19z
dXByZW11bShyZWMpKSB7Ci0JCS8qIEVtcHR5IHBhZ2VzIGNhbiByZXN1bHQgZnJvbSBidWZmZXJl
ZCBkZWxldGUgb3BlcmF0aW9ucy4KLQkJVGhlIGZpcnN0IHJlY29yZCBmcm9tIHRoZSBmcmVlIGxp
c3QgY2FuIGJlIHVzZWQgdG8gZmluZCB0aGUKLQkJZmF0aGVyIG5vZGUuICovCi0JCXJlYyA9IHBh
Z2VfaGVhZGVyX2dldF9wdHIocGFnZSwgUEFHRV9GUkVFKTsKLQkJaWYgKFVOSVZfVU5MSUtFTFko
cmVjID09IE5VTEwpKSB7Ci0JCQlmcHV0cygiSW5ub0RCOiBUcnlpbmcgdG8gaW5zZXJ0IGEgcmVj
b3JkIGZyb20iCi0JCQkgICAgICAiIHRoZSBpbnNlcnQgYnVmZmVyIHRvIGFuIGluZGV4IHBhZ2Vc
biIKLQkJCSAgICAgICJJbm5vREI6IGJ1dCB0aGUgaW5kZXggcGFnZSBpcyBlbXB0eSFcbiIsCi0J
CQkgICAgICBzdGRlcnIpOwotCQkJZ290byBkdW1wOwotCQl9CisJCWZwdXRzKCJJbm5vREI6IFRy
eWluZyB0byBpbnNlcnQgYSByZWNvcmQgZnJvbSIKKwkJICAgICAgIiB0aGUgaW5zZXJ0IGJ1ZmZl
ciB0byBhbiBpbmRleCBwYWdlXG4iCisJCSAgICAgICJJbm5vREI6IGJ1dCB0aGUgaW5kZXggcGFn
ZSBpcyBlbXB0eSFcbiIsCisJCSAgICAgIHN0ZGVycik7CisJCWdvdG8gZHVtcDsKIAl9CiAKIAlp
ZiAoVU5JVl9VTkxJS0VMWShyZWNfZ2V0X25fZmllbGRzKHJlYywgaW5kZXgpCgo=

--===============1073895158==
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.5-innodb/
# testament_sha1: 1a8e9d3d91fdaa2beb4f90e62e24ae87a86343c4
# timestamp: 2010-09-09 13:48:09 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   jfmd3hgtqz6ujva9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfvH9NUAAclflFAwcmf//1ci
FAS////wBAAIAFAEXvOwADtZQGhGip6mTxU9TwU9T9Q9U9JjUeobRHpGCGBNBqZGpMxCaaYgQNPU
GjAAJghhzAATJgATCYJhDAEYAIp+ik8IhoaAAAAANAyBoCSQJoATRlM0SM0JtJqNPUyZGJkeoyIq
KIooK478uLm+fv1I7sx+Wud4UsE5unwg/5P+pk4RQuLhgeABdYikdVdMB1ER/77o0sQIPUIogqWA
jJFdDcYEY76a1TGn3YZKkWZIApZxhKpzSD4lINmLjaEIQkULYHhtZudzjpvC0eEvhM6gz7YtVCrA
e/zrhnonhVZCj7q5TV+fT4LXaLP4ztfkRm1yySIcUi7bfTKvsiK/nbaKEkoCG5iHappNRA2uUYIJ
LzKn1CLkFD2TKr2HQ9KI/stywLWWshD+51qDx9vkXPZ0VaUUvLs8/Bcj8Vb/kulPdoUssMeG1uoR
Eu02Ym6wVNBxRKKdGAbvi3xRbpHkthVY+weQORNyvXDDkWV1Mt/dW/RRV3WywNrOYhBlnMteKsiW
UDFui3vpMeGyJixbINIuIHEMrMFAijQLdLMTFiF+XBXXKhWWcxeqrvOEld1EcFdEzTSLrk4fVPMT
771ZlFwqNFB0CI8JbsplJUNZK3dWRYmmsEFbq73KswpcWlA1b2wWxTt3+lZCm5GFO2xnRyRdAocm
oaJMJzaxV+30NnjlmWu8H8uzpetEiqdbDM3zPp5EKERqO2Yo/PB19PW8PTn4UKkcHE4Gay9V2pGv
frzSNtmHtisGkDGqRj0nn1wf3tMx9akfetIuo/h/UxTCrxZeHHx2j0xIxZut2e4Q4Xl2gxWp4C6J
/vVBcrF5acLd7MkUWpGmGDpMbmVpB63CFoug0B10WCFGKqmkEGJFjCExFLF2KXlKVhaXz1Y6SCGR
25VoAqeVc0jCsXzbheiCQ4nEBHNFOHTeEXqlYpiyTG2DApeQ2bkK0Aow9OBRTBtHc6MjWEDm32PV
DfQScoNvJa2TKnKbgZRUORzUEwvE8N+/fGOq7NiV5FH2795/q4OXu+znN7IIrM2QNLkpbtO7c2of
kgrfdosVJdLt4hwMrVqn8LOgNzFE8IVFZEZQx5W/Zk2AoD/KY1uCyXuDTuwl32rZ2Ljmm7Ej8ZBt
BP4hWFbklzmkMe+qCo2tY+bmqf2gvNI0D6HsGdwoW5UV+TcKMTqlaSvkPFKB/jP/0oCmEgmygMLg
8Jj9qouFRAKgpZOZMruXYwmSKR03dTqjqc9CmH6SdCEndVX3SKgk9bnq/nmTYqXJlozJ5IJ7uMYo
lX5ixFaqs89jMJj9YJLOMH/St83RQ1tzi+RiykhUr4C2VY0Po1EyKJJl59sKq+DtsJtm7UTThM2U
BY4urBprumvzAAZR3AV5z7RsKoQHKIgxbwukNlMVNodIFopEMTRhYtVk6lY1j1XZiE8t6S3rfbB1
SvhOcaqYeSxNtyYPUT6+gmUDBsmWmmLhmYpV1BK0X/E/r/4u5IpwoSH3j+mq


--===============1073895158==--