From: marko.makela
Date: May 19 2010 9:37am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3106)
List-Archive: http://lists.mysql.com/commits/108599
Message-Id: <201005190937.o4J9AqoX002742@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2043925313=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwOTM2MjctbmFzZm0x
Ym84MzdseXJrbQoKIDMxMDYgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBNZXJnZSBh
IGNoYW5nZSBmcm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAtLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgcmV2
bm86IDM0NzIKICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTE5MDgwNzQzLTVteWYxZzd2NnBmeXNpZHQKICAgICAgcGFyZW50OiBtYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEwMDUxOTA4MDE1Mi1oMzU1NW9xbXUzd285NXNvCiAgICAgIGNvbW1pdHRlcjog
TWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tPgogICAgICBicmFuY2ggbmlj
azogNS4xLWlubm9kYgogICAgICB0aW1lc3RhbXA6IFdlZCAyMDEwLTA1LTE5IDExOjA3OjQzICsw
MzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgTWFrZSBVTklWX0RFQlVHIFZhbGdyaW5kIGZyaWVu
ZGx5LiBVc2UgfCBpbnN0ZWFkIG9mICssCiAgICAgICAgYW5kIG1hc2sgb3V0IHRoZSBkb250LWNh
cmUgYml0cyBpbiBkZWJ1ZyBhc3NlcnRpb25zLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvbWFjaDBkYXRhLmljCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvbWFjaDBkYXRhLmljJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvbWFjaDBkYXRhLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5
MDkzNjI3LW5hc2ZtMWJvODM3bHlya20KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21h
Y2gwZGF0YS5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA5MzcyMS10
anBnZnY5aW42ZmtodHN0CkBAIC0zNiw3ICszNiw3IEBAIG1hY2hfd3JpdGVfdG9fMSgKIAl1bGlu
dAluKQkvKiE8IGluOiB1bGludCBpbnRlZ2VyIHRvIGJlIHN0b3JlZCwgPj0gMCwgPCAyNTYgKi8K
IHsKIAl1dF9hZChiKTsKLQl1dF9hZChuIDw9IDB4RkZVTCk7CisJdXRfYWQoKG4gfCAweEZGVUwp
IDw9IDB4RkZVTCk7CiAKIAliWzBdID0gKGJ5dGUpbjsKIH0KQEAgLTY1LDcgKzY1LDcgQEAgbWFj
aF93cml0ZV90b18yKAogCXVsaW50CW4pCS8qITwgaW46IHVsaW50IGludGVnZXIgdG8gYmUgc3Rv
cmVkICovCiB7CiAJdXRfYWQoYik7Ci0JdXRfYWQobiA8PSAweEZGRkZVTCk7CisJdXRfYWQoKG4g
fCAweEZGRkZVTCkgPD0gMHhGRkZGVUwpOwogCiAJYlswXSA9IChieXRlKShuID4+IDgpOwogCWJb
MV0gPSAoYnl0ZSkobik7CkBAIC04MSwxMCArODEsNyBAQCBtYWNoX3JlYWRfZnJvbV8yKAogLyo9
PT09PT09PT09PT09Ki8KIAljb25zdCBieXRlKgliKQkvKiE8IGluOiBwb2ludGVyIHRvIDIgYnl0
ZXMgKi8KIHsKLQl1dF9hZChiKTsKLQlyZXR1cm4oICgodWxpbnQpKGJbMF0pIDw8IDgpCi0JCSsg
KHVsaW50KShiWzFdKQotCQkpOworCXJldHVybigoKHVsaW50KShiWzBdKSA8PCA4KSB8ICh1bGlu
dCkoYlsxXSkpOwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKiovLyoqCkBAIC0xMjksNyArMTI2LDcgQEAgbWFjaF93cml0ZV90b18z
KAogCXVsaW50CW4pCS8qITwgaW46IHVsaW50IGludGVnZXIgdG8gYmUgc3RvcmVkICovCiB7CiAJ
dXRfYWQoYik7Ci0JdXRfYWQobiA8PSAweEZGRkZGRlVMKTsKKwl1dF9hZCgobiB8IDB4RkZGRkZG
VUwpIDw9IDB4RkZGRkZGVUwpOwogCiAJYlswXSA9IChieXRlKShuID4+IDE2KTsKIAliWzFdID0g
KGJ5dGUpKG4gPj4gOCk7CkBAIC0xNDgsOCArMTQ1LDggQEAgbWFjaF9yZWFkX2Zyb21fMygKIHsK
IAl1dF9hZChiKTsKIAlyZXR1cm4oICgodWxpbnQpKGJbMF0pIDw8IDE2KQotCQkrICgodWxpbnQp
KGJbMV0pIDw8IDgpCi0JCSsgKHVsaW50KShiWzJdKQorCQl8ICgodWxpbnQpKGJbMV0pIDw8IDgp
CisJCXwgKHVsaW50KShiWzJdKQogCQkpOwogfQogCkBAIC0xODMsOSArMTgwLDkgQEAgbWFjaF9y
ZWFkX2Zyb21fNCgKIHsKIAl1dF9hZChiKTsKIAlyZXR1cm4oICgodWxpbnQpKGJbMF0pIDw8IDI0
KQotCQkrICgodWxpbnQpKGJbMV0pIDw8IDE2KQotCQkrICgodWxpbnQpKGJbMl0pIDw8IDgpCi0J
CSsgKHVsaW50KShiWzNdKQorCQl8ICgodWxpbnQpKGJbMV0pIDw8IDE2KQorCQl8ICgodWxpbnQp
KGJbMl0pIDw8IDgpCisJCXwgKHVsaW50KShiWzNdKQogCQkpOwogfQogCkBAIC03MjEsNyArNzE4
LDcgQEAgbWFjaF9yZWFkX2Zyb21fMl9saXR0bGVfZW5kaWFuKAogLyo9PT09PT09PT09PT09PT09
PT09PT09PT09PT0qLwogCWNvbnN0IGJ5dGUqCWJ1ZikJCS8qITwgaW46IGZyb20gd2hlcmUgdG8g
cmVhZCAqLwogewotCXJldHVybigodWxpbnQpKCpidWYpICsgKCh1bGludCkoKihidWYgKyAxKSkp
ICogMjU2KTsKKwlyZXR1cm4oKHVsaW50KShidWZbMF0pIHwgKCh1bGludCkoYnVmWzFdKSA8PCA4
KSk7CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCgo=

--===============2043925313==
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.5-innodb/
# testament_sha1: be4ebfc680f98deb118906d943644119c0810587
# timestamp: 2010-05-19 12:37:31 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   nasfm1bo837lyrkm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXoGa+kAAmjfgFAwW2///1en
A4q////0UAUMnqZdZLmFVGyQJJCKeTTEU9o0mxNNI1MmCADajQep6R6gaqNH6oYmnqeiAYTQNAaG
g00xDENAJIhqaCZFH5TU2k9Ro0aGhoAbUAAA5gTE0GEyZMmRhME00yMTAEMAklMmQ0mCGmmlT/VM
k3o0KemU/VG9UGmR+qANMnQEQiJFVVCqRZoL7ohk5vLge+WTTPIphk5osV75qCL2DeqamrN8aNsy
jtR6ql5/gyZe6/jM9TAzI+kc7MzfBLXF3Psk2t/BOUrOrSkm3Udpy4rq0o0ne0PC+4DnNmLx6/B7
4b3b6xxy+9hog3GyExD9SQ/EJeMDBg1sVFCo149uq7AjufM5pMAHW5HoPANz1KcDeUlxl0L2vT22
IGcJhmY8e46jMj9E02CBpnKJE+Hn0Nugb5ZEjOGbvk7gjkyBdZntJ+1bXih0RGVoem5C6l2oVOkn
qqj5okQBNVNNsvmunBMC4g/YZwxZIejwogaxkGI7qZhuXpILkla09XoPFVZWyR5d0aNdUAg9MjSw
nyHCJKsn3mfBS2c76m8ud6Rlm08TaEg5l1z8UHNpzYXY4dax7OR8qskQk8uoOInZeXLKuAPAMGHx
b4i1mZORKL61ql2mhREvqOydBtDaoJwWVnuutSTrWULBjAmgSNNlA4M0S1GchgAnSKodS8DYVEoD
hEXkUimRdS5Oh9hZENCYqNYXHuJ7YZkt1mpZXajINcFhqUy0gYK/zxC3Z2qwi7UJmD5ZRpmEJ8lK
xcMa1nlnZi15NjMMCAaOlUg2pnbdUgyngFpyZ5hEhC3Y2QVE4LEkgiF2ZPrMhR0h08OXrqquym1W
3thdiMRT6DAIPiuaK3jMMeiN/M2twAZHuYotubZlpnpN2n3WW/oPP6JQ5EnlouhCxkmGl9T9/an5
BchMRo8/NhVhPW/b38ZWZ3MebFvYwzBjw1DulzN/NYV6kyG1fG2InZPDuJQ9yF/sZ4rp6UKjYmoT
w6wQr/lgXEFfeccLEpEkKlNFl3rRiIXm4955G8Y4Dj0GIlB1S9Q6Dyy/RePL4UmnCcQxSFxjaFp9
YSl01hWZkQqPzkPWrCl73jIUym5oV0Kp2aAPsHKZM8ilvXQKyQVqUsgxJPqp6fl7fbyd3bU8S22F
BcPtkp6oDyuw3TEAdRPYcqaSz0ZklncfRMim+s5Y7xmLaS7YieoFQnZbawy8u8yM3jjQmNoRDik+
WGslFlWjXBHRnFXhTPXJgk0YsOBcX7ETNkBjS2btFsQPs4prDdV5ilPE0N2YOWR4C9VG0LcfzY5t
CDs1xwpQY60HXuISxCre2hNbxGQqhVhmEG4+0qchapUJlJggZryiILfquuxkKlWnfsQsxzj8C8cm
fnWIylsV1SsKSMmNNu2eTma9UD72gJhUOVdOCoDMG+HkUjephXlDjrMQ1qHZDKXZikrl8qEW1t7E
lSg4t2PRs6oXELF3zK+V2ZNo2mmiwgUB4/QVedNI3v1UbdOAOQGad4Ml9CrWa62TnWlmnkxVySwW
RxRZsC1QxROm0kOM3WXDa871ItMOygedVu78VVKCcvtFcb41yVEEM7bDoIIU/iOUCZqjEi2HYYuJ
uIohUFq2TE7LmJxcPO3DUtFyQcIKu8v9iu84iuUnWIKWs8enMT1ZZTNM0c3qtzt+w4Opheshhg/8
XckU4UJB6BmvpA==


--===============2043925313==--