From: marko.makela
Date: April 12 2011 7:54am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3575)
List-Archive: http://lists.mysql.com/commits/135230
Message-Id: <201104120755.p3C7t2lF008793@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0011414178=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTEwNDEyMDEyMTM3LWZxYW84
cTV4MjgzdWI4ZjYKCiAzNTc1IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMTIgW21lcmdlXQogICAg
ICBNZXJnZSBteXNxbC01LjUtaW5ub2RiIHRvIG15c3FsLXRydW5rLWlubm9kYi4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swd2FpdC5jCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvcXVlL3F1ZTBxdWUuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9sb2NrL2xvY2swd2FpdC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazB3
YWl0LmMJcmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDExMDQxMjAxMjEzNy1mcWFvOHE1
eDI4M3ViOGY2CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMHdhaXQuYwlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQxMjA3NTM0Ny0zcjJ1MjZtNmllZmpyZzRlCkBA
IC0yMDksNyArMjA5LDcgQEAgbG9ja193YWl0X3N1c3BlbmRfdGhyZWFkKAogCWRvdWJsZQkJd2Fp
dF90aW1lOwogCXRyeF90KgkJdHJ4OwogCXVsaW50CQloYWRfZGljdF9sb2NrOwotCWlib29sCQl3
YXNfZGVjbGFyZWRfaW5zaWRlX2lubm9kYgk9IEZBTFNFOworCWlib29sCQl3YXNfZGVjbGFyZWRf
aW5zaWRlX2lubm9kYjsKIAlpYl9pbnQ2NF90CXN0YXJ0X3RpbWUJCQk9IDA7CiAJaWJfaW50NjRf
dAlmaW5pc2hfdGltZTsKIAl1bGludAkJc2VjOwpAQCAtMjcwLDE3ICsyNzAsNiBAQCBsb2NrX3dh
aXRfc3VzcGVuZF90aHJlYWQoCiAJbG9ja193YWl0X211dGV4X2V4aXQoKTsKIAl0cnhfbXV0ZXhf
ZXhpdCh0cngpOwogCi0JaWYgKHRyeC0+ZGVjbGFyZWRfdG9fYmVfaW5zaWRlX2lubm9kYikgewot
Ci0JCXdhc19kZWNsYXJlZF9pbnNpZGVfaW5ub2RiID0gVFJVRTsKLQotCQkvKiBXZSBtdXN0IGRl
Y2xhcmUgdGhpcyBPUyB0aHJlYWQgdG8gZXhpdCBJbm5vREIsIHNpbmNlIGEKLQkJcG9zc2libGUg
b3RoZXIgdGhyZWFkIGhvbGRpbmcgYSBsb2NrIHdoaWNoIHRoaXMgdGhyZWFkIHdhaXRzCi0JCWZv
ciBtdXN0IGJlIGFsbG93ZWQgdG8gZW50ZXIsIHNvb25lciBvciBsYXRlciAqLwotCi0JCXNydl9j
b25jX2ZvcmNlX2V4aXRfaW5ub2RiKHRyeCk7Ci0JfQotCiAJaGFkX2RpY3RfbG9jayA9IHRyeC0+
ZGljdF9vcGVyYXRpb25fbG9ja19tb2RlOwogCiAJc3dpdGNoIChoYWRfZGljdF9sb2NrKSB7CkBA
IC0zMDQsMTcgKzI5MywyMSBAQCBsb2NrX3dhaXRfc3VzcGVuZF90aHJlYWQoCiAKIAkvKiBTdXNw
ZW5kIHRoaXMgdGhyZWFkIGFuZCB3YWl0IGZvciB0aGUgZXZlbnQuICovCiAKLQl1dF9hZCghdHJ4
X211dGV4X293bih0cngpKTsKKwl3YXNfZGVjbGFyZWRfaW5zaWRlX2lubm9kYiA9IHRyeC0+ZGVj
bGFyZWRfdG9fYmVfaW5zaWRlX2lubm9kYjsKKworCWlmICh3YXNfZGVjbGFyZWRfaW5zaWRlX2lu
bm9kYikgeworCQkvKiBXZSBtdXN0IGRlY2xhcmUgdGhpcyBPUyB0aHJlYWQgdG8gZXhpdCBJbm5v
REIsIHNpbmNlIGEKKwkJcG9zc2libGUgb3RoZXIgdGhyZWFkIGhvbGRpbmcgYSBsb2NrIHdoaWNo
IHRoaXMgdGhyZWFkIHdhaXRzCisJCWZvciBtdXN0IGJlIGFsbG93ZWQgdG8gZW50ZXIsIHNvb25l
ciBvciBsYXRlciAqLworCisJCXNydl9jb25jX2ZvcmNlX2V4aXRfaW5ub2RiKHRyeCk7CisJfQor
CiAJb3NfZXZlbnRfd2FpdChzbG90LT5ldmVudCk7CiAKIAkvKiBBZnRlciByZXN1bWluZywgcmVh
Y3F1aXJlIHRoZSBkYXRhIGRpY3Rpb25hcnkgbGF0Y2ggaWYKIAluZWNlc3NhcnkuICovCiAKLQlp
ZiAoaGFkX2RpY3RfbG9jaykgewotCi0JCXJvd19teXNxbF9mcmVlemVfZGF0YV9kaWN0aW9uYXJ5
KHRyeCk7Ci0JfQotCiAJaWYgKHdhc19kZWNsYXJlZF9pbnNpZGVfaW5ub2RiKSB7CiAKIAkJLyog
UmV0dXJuIGJhY2sgaW5zaWRlIElubm9EQiAqLwpAQCAtMzIyLDYgKzMxNSwxMSBAQCBsb2NrX3dh
aXRfc3VzcGVuZF90aHJlYWQoCiAJCXNydl9jb25jX2ZvcmNlX2VudGVyX2lubm9kYih0cngpOwog
CX0KIAorCWlmIChoYWRfZGljdF9sb2NrKSB7CisKKwkJcm93X215c3FsX2ZyZWV6ZV9kYXRhX2Rp
Y3Rpb25hcnkodHJ4KTsKKwl9CisKIAl3YWl0X3RpbWUgPSB1dF9kaWZmdGltZSh1dF90aW1lKCks
IHNsb3QtPnN1c3BlbmRfdGltZSk7CiAKIAkvKiBSZWxlYXNlIHRoZSBzbG90IGZvciBvdGhlcnMg
dG8gdXNlICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9xdWUvcXVlMHF1
ZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3F1ZS9xdWUwcXVlLmMJcmV2aWQ6c3VubnkuYmFp
bnNAb3JhY2xlLmNvbS0yMDExMDQxMjAxMjEzNy1mcWFvOHE1eDI4M3ViOGY2CisrKyBiL3N0b3Jh
Z2UvaW5ub2Jhc2UvcXVlL3F1ZTBxdWUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDQxMjA3NTM0Ny0zcjJ1MjZtNmllZmpyZzRlCkBAIC0xMjE2LDkgKzEyMTYsNiBAQCBsb29w
OgogCQlnb3RvIGxvb3A7CiAKIAljYXNlIFFVRV9USFJfTE9DS19XQUlUOgotCQkvKiBUaGUgLi4u
X215c3FsXy4uLiBmdW5jdGlvbiB3b3JrcyBhbHNvIGZvciBJbm5vREIncwotCQlpbnRlcm5hbCB0
aHJlYWRzLiBMZXQgdXMgd2FpdCB0aGF0IHRoZSBsb2NrIHdhaXQgZW5kcy4gKi8KLQogCQlsb2Nr
X3dhaXRfc3VzcGVuZF90aHJlYWQodGhyKTsKIAogCQl0cnhfbXV0ZXhfZW50ZXIodGhyX2dldF90
cngodGhyKSk7Cgo=

--===============0011414178==
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: 133a349832c411c39beb45590159f6b6c1f2f2b5
# timestamp: 2011-04-12 10:54:58 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: sunny.bains@stripped\
#   fqao8q5x283ub8f6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVB5YK4ABVpflAAwenf//3/n
/+C////6BAAIAGAKPX293ne7YAB1QrXdu7AHIdAKKaNAkoinjSJo09ENNpM0nlGho000Bo0Bo0A0
ASiEyYjUGmKelNGg9R6aCAGQaAABoBEympvVNGgA9QAAAAaAAAAABIko0yaQMp7SNGJNNP0ieo9I
xNMagZDAjCBw00wQyGmmRkwgGmgDCaNMmABA0EkgTIAQ0GppoFPU8gJqbKDYpo0bUNDRkNC6IFCG
JttpeXacxJF4Zsb1/GE46giI8wodLLLtGiOYNDNkO0Y6oTFWaYpQJPsuww229VTvfaKCTjPN02Hs
hZ3wdY+bWyIupNnzxkoQd+MP55YXfgGh+Rsy3AwBqAxttDY2l2dSXfYLZKpkpMbvswChQoFRASFK
WBcQTYNZJmldhgwFuSRMfocgKn8ebI4EpluGHAdkXJZfg8WkY9cGlDde220aRPfoxfdEUJTIK4Rv
BSdxCAqtPVB+2qZQUkSFntCsg8YVDHAxkWiMMwQo4B7LaMafYrPiTPFaHBrYOmUjiHNu3bGbcyXl
ddNZJPI81GskpWYQsucnCwMVAXvR5uLUA3svZmQDa4iG33oqRr3HUR8hFRwEbz8xJchF4i1wrYMA
iSNMSIVZJy6NsM2bxYNsqQZZ6V2NV4lbuNs04gggAL+qZUhZkcptsmLkgia3ERCr8SblvcTBYsGT
ObJkmYNaFKNBnwMRxXxIABzEMrSNKvTUePYdLydtE4STyweWFBFVpERVUYBL3xEUkMSGcMgZFeZY
xcYp40RofMR8FN61F1rI7BGld9bnii5ywycRb2DYH2+UxJNiXHeGx5MtoJLTYt5YGhChWVCJ5tRa
jAiCsXysHjVulJ1hDePrMch2dyLFqBIHF/ExK36Scg+8RY4YrNZEK/Q6LQIBaDCIHMsHMxw5CPDq
33ye1OAw0FDImAEUClenKYxw3mt5KyUhD3vg6qUxEUcSRMfcqz9BEbNjRbzWLxD7zdWg5HrZMMfe
APzxGcdDwJiHwNjSwxhARswKjBsXY00e8xd4DPTUazTKherrzARTCfIjjepVNUtRFJRBhFpMt8zi
QJzLsKokz/ojURvERW3HBqNnkZSHLYSYcG8YIvEKT6ErsYJ4jE3uHndtJNO+2VRsMBFo+Nl0tCYZ
FomXr2iPagmSdjcxfDiX7VXeU7BO8iRuHkm1tKhyiF94pZ2hBpkuBi8hERi13BomeiRl1NmW6F5c
In1forycpXbH4vanLhKMHPMWXTEMSzVe918TVEuRSVcis0FEo2AgwZ1CkHlHcDRKN5MqEXRoWGoh
hFS2OdY5raNWIeoRgUyg2ASEMcZYm5x9RaaDxE7RGeZWsVquFLrDcZiKEC7YPMlWNPYxHYkVGJUI
e6qA4jVHElZBUHYJa11R0GpZMfgcc5ZVXm1VrwEetOeSEX6JlumdrXZ2vEHZac6Va4wkouIpcDyc
xhDYT3+LLv3WmaNzVsZMXFw4gXjVBJI4DxRHAMVDRFQgatTjKhFIdVwjiFtBvmxiSemxpxnbThaH
mG46hsxGp9QyZMJGNx9BVrAZmYZDEFBlnr/MiPedDyzfUFNU87oezG32ZIARrwqj+VyeRnfkJE5P
f/EvVZo2Na2rd+YnTpkdL6GipYI8b5NeVEfgsmsX96c5y+1VBe+KeOfaF/HanQc7WMVDTx5nuF2C
6C94okMayjNEhtwLeQxtB0wWR2iYdhwBPyUExKVkcrgV8RewHE0c8RpCxPkRh/YtQxvlYAHgO9g9
NNxFB91S7voj9iQvjoahqUH+LfNNdhoIzEvYWpCuFrL+FCMExNMWmPWhdQhuQ7mdR8bh5vD5L91l
Z2YnzUz5Hx7MbtwjLoPrMhx2l5DnsNvYQa4dkpIQyC0RmMd1LX54HXHEgMIzPueNAR3AZzEP0eI+
ZcbSkzgLkWGRgaLvqKn6Ke3ymnOSiOcMIeAGgAcDiKcKjyKEyyI5uxw4XLea+I9Zm8NSVxralLWs
DkUaJUIuFcPcbhB1dBEi0tHAabjQX+yVuYiJd4i0B9ZqYLmdhz8O01NTqhaH6n8nEw6VgyHgA5MH
Q7zlFQfzLSgpJ1XGyl0MVhlxnAocIbzigoxRmAlAiBmJIEjUiGGaF6apknoohPYu4kBMxs7jyzBK
KZyzYbxDzoZSY+ujjZDuHh9Ehe/cOKGh3/TeLwPFTE8DmTGmMbejkVnr5OGPxN52hZkNyMxwhxWZ
GScIqJo2YCNTkek1PORqc13+Qw8wcVnWInQu6SFdcev0yF+oewLgyEdjv7m8UB6mdZ7V83mxU9jQ
Yki+ke+cwC9ghnqBb+2i5YXtJDTOVmsDEbkjito9YJFhp5p+Z3GRwEVCHGnrEVlYVephdAXCIZeo
sPJBsmGmMDL68zNhDMMXBaPAb8m7DkXLHAQy695UzDGpsEekuTJjAoHo9AjeI0QaJDCqSF+ZkbUH
dHehK9w8+B0AvEXjgHskKIiew2zDxDyJAA4N4wTdM+wy4jFZCw/B3o+jdDItGLnGIksvARa8wSFo
iwsGchhwMndDejIHloU6isiRFcZi9ghjOlZOQw8YREGF8B5RMgiQE5I2FVqR/FEBBAYkkUlKnsiV
CAaiAOSSU1I1kw+saK4SFFRRA5CHCDBdfZc/6g7BAXITC+BMkQhPuJ7BjHYMMfkAGCB4Fohke54m
LiRd5byvuUthQR1lhX1jAwDxY2h9pf6i/hMhM81Yq17vJZ0zLhx8e4XUM1HAxViGiECMZBmkKyy9
BV2iHCQ43Ehwv8CJzEN2900JQRWtQjxT6gjFI0QKscgeJihJubKoYzIGbyKtFzJusIjC1+eoUNqq
rgaOEKEhBwRDtqCuLeFMhOQmDkR6DMb8jI3FYPMkDMF8v1qWJmFB+ZBd7yyAQXM9oEyX7R447aje
MqGYHEZFwwsGDFUIYGQM8bzUhSMEFgu0QwTEaxPciptpbtAQVLIViMZcTXEfBBod7XIu6SR9oW0P
XwqbRQj6Q7GKxBtZKRLYQEwLwc8InguBQ4JonXAKDVCqGX2KCAp6IDhhkxmXiN/q9q+O4htJLXvv
OiMDERqsw3B/4NTA/+LuSKcKEgoPLBXA


--===============0011414178==--