From: marko.makela
Date: April 20 2011 10:47am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3596)
List-Archive: http://lists.mysql.com/commits/135789
Message-Id: <201104201047.p3KAld5Q012220@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1623699371=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDA4MzM0OC03OWlt
MnZ1bmNuM3FkN3UwCgogMzU5NiBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTIwCiAgICAgIE5vbi1m
dW5jdGlvbmFsIGNoYW5nZXMuCiAgICAgIAogICAgICBidHJfY3VyX2luc19sb2NrX2FuZF91bmRv
KCk6IFJlbW92ZSBvbmUgbGV2ZWwgb2YgaW5kZW50YXRpb24gZnJvbSB0aGUgdGFpbC4KICAgICAg
CiAgICAgIGJ0cl9jdXJfdXBkYXRlX2luX3BsYWNlKCk6IFNwbGl0IGEgbGluZSBhIGxpdHRsZSBi
ZXR0ZXIuCiAgICAgIAogICAgICByb3dfdW5kb19pbnNfcmVtb3ZlX2NsdXN0X3JlYygpOiBVc2Ug
Y29tbW9uIGZ1bmNfZXhpdC4KICAgICAgCiAgICAgIHJvd191cGRfY2x1c3Rfc3RlcCgpOiBSZXR1
cm4gcm93X3VwZF9jbHVzdF9yZWMoKSBkaXJlY3RseS4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzB1aW5zLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jCj09PSBtb2RpZmll
ZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvYnRyL2J0cjBjdXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQy
MDA4MzM0OC03OWltMnZ1bmNuM3FkN3UwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBj
dXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMDEwNDcyNy11dHZraG5x
MjRxemUxdWRyCkBAIC0xMTA1LDI5ICsxMTA1LDI3IEBAIGJ0cl9jdXJfaW5zX2xvY2tfYW5kX3Vu
ZG8oCiAJCQkJCSAgICAgYnRyX2N1cl9nZXRfYmxvY2soY3Vyc29yKSwKIAkJCQkJICAgICBpbmRl
eCwgdGhyLCBtdHIsIGluaGVyaXQpOwogCi0JaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CisJaWYg
KGVyciAhPSBEQl9TVUNDRVNTCisJICAgIHx8ICFkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4KSB8
fCBkaWN0X2luZGV4X2lzX2lidWYoaW5kZXgpKSB7CiAKIAkJcmV0dXJuKGVycik7CiAJfQogCi0J
aWYgKGRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpICYmICFkaWN0X2luZGV4X2lzX2lidWYoaW5k
ZXgpKSB7Ci0KLQkJZXJyID0gdHJ4X3VuZG9fcmVwb3J0X3Jvd19vcGVyYXRpb24oZmxhZ3MsIFRS
WF9VTkRPX0lOU0VSVF9PUCwKLQkJCQkJCSAgICB0aHIsIGluZGV4LCBlbnRyeSwKLQkJCQkJCSAg
ICBOVUxMLCAwLCBOVUxMLAotCQkJCQkJICAgICZyb2xsX3B0cik7Ci0JCWlmIChlcnIgIT0gREJf
U1VDQ0VTUykgeworCWVyciA9IHRyeF91bmRvX3JlcG9ydF9yb3dfb3BlcmF0aW9uKGZsYWdzLCBU
UlhfVU5ET19JTlNFUlRfT1AsCisJCQkJCSAgICB0aHIsIGluZGV4LCBlbnRyeSwKKwkJCQkJICAg
IE5VTEwsIDAsIE5VTEwsCisJCQkJCSAgICAmcm9sbF9wdHIpOworCWlmIChlcnIgIT0gREJfU1VD
Q0VTUykgewogCi0JCQlyZXR1cm4oZXJyKTsKLQkJfQorCQlyZXR1cm4oZXJyKTsKKwl9CiAKLQkJ
LyogTm93IHdlIGNhbiBmaWxsIGluIHRoZSByb2xsIHB0ciBmaWVsZCBpbiBlbnRyeSAqLworCS8q
IE5vdyB3ZSBjYW4gZmlsbCBpbiB0aGUgcm9sbCBwdHIgZmllbGQgaW4gZW50cnkgKi8KIAotCQlp
ZiAoIShmbGFncyAmIEJUUl9LRUVQX1NZU19GTEFHKSkgeworCWlmICghKGZsYWdzICYgQlRSX0tF
RVBfU1lTX0ZMQUcpKSB7CiAKLQkJCXJvd191cGRfaW5kZXhfZW50cnlfc3lzX2ZpZWxkKGVudHJ5
LCBpbmRleCwKLQkJCQkJCSAgICAgIERBVEFfUk9MTF9QVFIsIHJvbGxfcHRyKTsKLQkJfQorCQly
b3dfdXBkX2luZGV4X2VudHJ5X3N5c19maWVsZChlbnRyeSwgaW5kZXgsCisJCQkJCSAgICAgIERB
VEFfUk9MTF9QVFIsIHJvbGxfcHRyKTsKIAl9CiAKIAlyZXR1cm4oREJfU1VDQ0VTUyk7CkBAIC0x
OTIwLDggKzE5MTgsOCBAQCBidHJfY3VyX3VwZGF0ZV9pbl9wbGFjZSgKIAkJCQkgICAgdHJ4LCBy
b2xsX3B0ciwgbXRyKTsKIAogCWlmICh3YXNfZGVsZXRlX21hcmtlZAotCSAgICAmJiAhcmVjX2dl
dF9kZWxldGVkX2ZsYWcocmVjLCBwYWdlX2lzX2NvbXAoCi0JCQkJCSAgICAgYnVmX2Jsb2NrX2dl
dF9mcmFtZShibG9jaykpKSkgeworCSAgICAmJiAhcmVjX2dldF9kZWxldGVkX2ZsYWcoCisJCSAg
ICByZWMsIHBhZ2VfaXNfY29tcChidWZfYmxvY2tfZ2V0X2ZyYW1lKGJsb2NrKSkpKSB7CiAJCS8q
IFRoZSBuZXcgdXBkYXRlZCByZWNvcmQgb3ducyBpdHMgcG9zc2libGUgZXh0ZXJuYWxseQogCQlz
dG9yZWQgZmllbGRzICovCiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jv
dy9yb3cwdWlucy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdWlucy5jCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIwMDgzMzQ4LTc5aW0ydnVuY24zcWQ3dTAK
KysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVpbnMuYwlyZXZpZDptYXJrby5tYWtlbGFA
b3JhY2xlLmNvbS0yMDExMDQyMDEwNDcyNy11dHZraG5xMjRxemUxdWRyCkBAIC05NywxNSArOTcs
MTIgQEAgcm93X3VuZG9faW5zX3JlbW92ZV9jbHVzdF9yZWMoCiAKIAlidHJfY3VyID0gYnRyX3Bj
dXJfZ2V0X2J0cl9jdXIoJihub2RlLT5wY3VyKSk7CiAKLQlzdWNjZXNzID0gYnRyX2N1cl9vcHRp
bWlzdGljX2RlbGV0ZShidHJfY3VyLCAmbXRyKTsKLQotCWJ0cl9wY3VyX2NvbW1pdF9zcGVjaWZ5
X210cigmKG5vZGUtPnBjdXIpLCAmbXRyKTsKLQotCWlmIChzdWNjZXNzKSB7Ci0JCXRyeF91bmRv
X3JlY19yZWxlYXNlKG5vZGUtPnRyeCwgbm9kZS0+dW5kb19ubyk7Ci0KLQkJcmV0dXJuKERCX1NV
Q0NFU1MpOworCWlmIChidHJfY3VyX29wdGltaXN0aWNfZGVsZXRlKGJ0cl9jdXIsICZtdHIpKSB7
CisJCWVyciA9IERCX1NVQ0NFU1M7CisJCWdvdG8gZnVuY19leGl0OwogCX0KKworCWJ0cl9wY3Vy
X2NvbW1pdF9zcGVjaWZ5X210cigmbm9kZS0+cGN1ciwgJm10cik7CiByZXRyeToKIAkvKiBJZiBk
aWQgbm90IHN1Y2NlZWQsIHRyeSBwZXNzaW1pc3RpYyBkZXNjZW50IHRvIHRyZWUgKi8KIAltdHJf
c3RhcnQoJm10cik7CkBAIC0xMzUsOCArMTMyLDggQEAgcmV0cnk6CiAJCWdvdG8gcmV0cnk7CiAJ
fQogCi0JYnRyX3BjdXJfY29tbWl0X3NwZWNpZnlfbXRyKCYobm9kZS0+cGN1ciksICZtdHIpOwot
CitmdW5jX2V4aXQ6CisJYnRyX3BjdXJfY29tbWl0X3NwZWNpZnlfbXRyKCZub2RlLT5wY3VyLCAm
bXRyKTsKIAl0cnhfdW5kb19yZWNfcmVsZWFzZShub2RlLT50cngsIG5vZGUtPnVuZG9fbm8pOwog
CiAJcmV0dXJuKGVycik7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHVwZC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjAwODMzNDgtNzlpbTJ2dW5jbjNxZDd1MAorKysg
Yi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdXBkLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTA0MjAxMDQ3MjctdXR2a2hucTI0cXplMXVkcgpAQCAtMjIwNSw4ICsyMjA1LDcg
QEAgZXhpdF9mdW5jOgogCiAJaWYgKG5vZGUtPmNtcGxfaW5mbyAmIFVQRF9OT0RFX05PX09SRF9D
SEFOR0UpIHsKIAotCQllcnIgPSByb3dfdXBkX2NsdXN0X3JlYyhub2RlLCBpbmRleCwgdGhyLCBt
dHIpOwotCQlyZXR1cm4oZXJyKTsKKwkJcmV0dXJuKHJvd191cGRfY2x1c3RfcmVjKG5vZGUsIGlu
ZGV4LCB0aHIsIG10cikpOwogCX0KIAogCXJvd191cGRfc3RvcmVfcm93KG5vZGUpOwoK

--===============1623699371==
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.6-innodb/
# testament_sha1: b7668d0f0dbdbb988a5a1e15cd7e376adc90f593
# timestamp: 2011-04-20 13:47:34 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   79im2vuncn3qd7u0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWa9WItQAA3rflHAwc3f//3+v
3mC////+BAAIAGAG/V9mmaAOnFoNrAdAHDImk0EGJTzSmzTQk0xNlPKNADRpoeUPTKeoAkqYqbJp
4knqHqaABo0BoHqAAAAA0HGjJkYRiAYTQYBNBoGTJoyZDCAwxIptFMNRpmk9JtJoAANNAGg0ANAa
BxoyZGEYgGE0GATQaBkyaMmQwgMJJEwjQCNMgiaZE8ppiDKeUyPamghkBtIU4gaQCQBiJCQCSRRV
UCp90PsKzftuuoTzxyCP+cnIIZBnjIjRTs94/ASGaQUgLbmqz0AkRvLoOczK3KI7EIMhOQRPnhJK
XJo46DiNb80zMaCikAkAovbyRp/qFdWvGoHMbN6GIKp1TQ148ZUm6NkJwYP+8DT1HXn1cxVL2w7k
x5sMLTy7djUWvuJckhj2hbC9pmYsgDOkVwK97U/u6dSauc8uTL4gY50rUpFltEhkIGEqEBiArmrI
1Q2N0BUn+ZnIUnW2mwK7cfG+1alY5FWbsdYfSARDuGXuzbJYFselon30n2vpIGYADeQMvgA1ECUK
QHYBVq4XdIIo6KYXn64ZI4BFVVuEANayknT54ziL4oHoYka2WjAzD+bj0I1apkCqQO2c4iMSYBYD
SQZzeoDOY3Ids9kMpGC+S9ZyJvjZ8EHpFkjBgzW/JfczpCSwIcySwYtq8K74EmIDKVkSRQiIEz2N
l02unW8Z29FweqmHZ8UFfOv+PKJyLjgNpWYJkFg/IRAnmOJ7ucIA/i4QySqUIqRZg+rUxd8hFUzh
36bdAV1DQvtpyZiSDC7WQrfSyZmb4pLjwOJntn84Y5ZcXMxeTKzGFFOYZW1uQyuEeUgaFlRcRZBh
Pf3BJxG9low9jASYlC/g0ylUhFpWTCNb2naDX4E5c0FhGoiMQEXUyltbWSv3wpZ1j8Rwb8ab7kFY
cr0ULEDsH78umQ4zKocuBQxQRuGlOq/PNETEzQbFb9cawtk0xFUqOERLUFm6RAaoyQVkN1oYYIkX
2HAeUCAWUquITJhagqognemoiqRjQaWC0UxtUSDokWkWlx1LYPQPIkdjfQt3yiqhkDYugZ55D6FU
LAn4esKt2KGaDZ2cGgYIseEXIaTQCYmlNtyD76Wsj+QZexirIuwgqqJjLnDFlNlYpIGgYyTr+vfL
QERAiBJ2GzeNo+zx3x7oeGA4zkn8qLo3WxwdpuNvXuZfjJekW7fVVEQnF5g88Xz9q+W1IJBG9mEy
zUSyCXj7dVefEg6w5AOvn+alns6dT5MMd7ReT+NcGYUvE+EVX7itRrb8HiJ0rowWbHCTAb9e4grO
M4KjFImIksEtd53VhoCZ5AhYqllE84Q9qS4+MXKHR/zcLPayD5WIDRq59tiCeOg8JmG0SPw0cgj0
/PPb7EcqvezfkcX2qoSYVodmSBvEro56C+GCYzQW81Zl2ILB5Wg9zzxNNfyqLylttCfhUw5AbIiG
9AON03SITf5C9MOT/KPXxNxt3ZGxMttRFH4g56Vigz+8dyN7/FB2PVMifBgMkHPtwWwE0xHECLdF
tquqpS7++QX+npoMACM4yaARYNtcuCIomGBdLKgp7MhCRlEE6CV0ty7CGlAy3pE1+/epWrVVRNTf
Tm4KLCTWJAvqjIdIcw0eN5F5EirWqyGkI6u5YHHkOGNw/JwnXgYK9Kuxdvmig46d538jzEZeUmgY
kdwNQOWH7r0p4P4nY89VTvoe6LeissQTmdby48gDbFOYhxakau7G6Uc63gYQSbeRwUAuMICO4IrN
dtmIn6DJ6687+KtgS20lacBNl6JrAXkv705Omm13aaoGDqzSX+8rRFwqwDCNObdHBeJ7gYZJefmn
G+KwQDCecu9pNZDu2Y5+fJr7UXXSQFYNcktwf0PqBk7q0WIPmuarBrB0IBgf43MTIRK3pkgylAlY
Byga5giHgsiAxTwnXnkByuXqY9YiAsAGZAyhx7bujkkxsoBliwZCRXvb4MlDzx0Zv1QFwr11jlr6
bS2sQZvLTw5OTI9RecQIhw7S4h40xnZ1StmaiPYH2COZmtK2eDCewUXQvcoKpPWNQ8GGGuSRr5o3
r8fb1UqvQN6zf4aBZCUgC5XrCXa2M9fcB4MM+6PndjgFdzmtSGYYbyj+Ybl9rOIbQ/PnqvBjJViZ
TRs40r1Qz4yAds+25yfEeu8grvqFIfq0ZQm6q8iL52Opo6RpeYwL7GaUhXKPWvMhwzkD60FHBRkX
4nsctwj3hp7xFD+C6B9YNxVyDOCeh2iRotkchGpjuTJQEewHJBjOQPwMEMRLZZEkfk8gi4iacPoz
GaP8P6P8XckU4UJCvViLUA==


--===============1623699371==--