From: marko.makela
Date: June 14 2011 5:40am
Subject: bzr commit into mysql-5.1 branch (marko.makela:3647)
List-Archive: http://lists.mysql.com/commits/139182
Message-Id: <201106140540.p5E5exFG013382@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1043774365=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC01LjEvIGJh
c2VkIG9uIHJldmlkOm1hdHRpYXMuam9uc3NvbkBvcmFjbGUuY29tLTIwMTEwNjEzMDkwOTU2LWIz
Z24yM2h1dG1hZmhiNmUKCiAzNjQ3IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDYtMTQKICAgICAgTWVy
Z2UgYSBmaXggZnJvbSBteXNxbC01LjUgdG8gbXlzcWwtNS4xOgogICAgICAKICAgICAgcmV2bm8g
Mjk5NS4zNy4yMDkKICAgICAgcmV2aXNpb24gaWQgbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MTA1MTgxMjA1MDgtcWhuN3Z6ODE0dm43N3Y1awogICAgICBwYXJlbnQgbWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA1MTcxMjE1NTUtbG1wbGUyNHF6eHFremVwNAogICAgICB0aW1lc3RhbXA6
IFdlZCAyMDExLTA1LTE4IDE1OjA1OjA4ICswMzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgRml4
IGEgYm9ndXMgVU5JVl9TWU5DX0RFQlVHIGZhaWx1cmUgaW4gdGhlIGZpeCBvZiBCdWcgIzU5NjQx
CiAgICAgICAgb3IgT3JhY2xlIEJ1ZyAjMTE3NjY1MTMuCiAgICAgIAogICAgICAgIHRyeF91bmRv
X2ZyZWVfcHJlcGFyZWQoKTogRG8gbm90IGFjcXVpcmUgb3IgcmVsZWFzZSB0cngtPnJzZWctPm11
dGV4LgogICAgICAgIFRoaXMgY29kZSBpcyBpbnZva2VkIGluIHRoZSBzaW5nbGUtdGhyZWFkZWQg
cGFydCBvZiBzaHV0ZG93biwgdGhlcmVmb3JlCiAgICAgICAgYSBtdXRleCBpcyBub3QgbmVlZGVk
LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vdHJ4L3RyeDB1bmRv
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi90cngvdHJ4MHVuZG8u
YycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwdW5kby5jCXJldmlkOm1hdHRp
YXMuam9uc3NvbkBvcmFjbGUuY29tLTIwMTEwNjEzMDkwOTU2LWIzZ24yM2h1dG1hZmhiNmUKKysr
IGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3RyeC90cngwdW5kby5jCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTEwNjE0MDU0MDMyLXlzOGI2aDZzNzd3dXJodWYKQEAgLTE5ODYsOCAr
MTk4Niw2IEBAIHRyeF91bmRvX2ZyZWVfcHJlcGFyZWQoCiAvKj09PT09PT09PT09PT09PT09PT0q
LwogCXRyeF90Kgl0cngpCS8qITwgaW4vb3V0OiBQUkVQQVJFRCB0cmFuc2FjdGlvbiAqLwogewot
CW11dGV4X2VudGVyKCZ0cngtPnJzZWctPm11dGV4KTsKLQogCXV0X2FkKHNydl9zaHV0ZG93bl9z
dGF0ZSA9PSBTUlZfU0hVVERPV05fRVhJVF9USFJFQURTKTsKIAogCWlmICh0cngtPnVwZGF0ZV91
bmRvKSB7CkBAIC0yMDAyLDYgKzIwMDAsNSBAQCB0cnhfdW5kb19mcmVlX3ByZXBhcmVkKAogCQkJ
ICAgICAgIHRyeC0+aW5zZXJ0X3VuZG8pOwogCQl0cnhfdW5kb19tZW1fZnJlZSh0cngtPmluc2Vy
dF91bmRvKTsKIAl9Ci0JbXV0ZXhfZXhpdCgmdHJ4LT5yc2VnLT5tdXRleCk7CiB9CiAjZW5kaWYg
LyogIVVOSVZfSE9UQkFDS1VQICovCgo=

--===============1043774365==
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/mysql-5.1/
# testament_sha1: edab7f78ff913225e5560dac38dd50012720ee73
# timestamp: 2011-06-14 08:40:51 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/
# base_revision_id: mattias.jonsson@stripped\
#   b3gn23hutmafhb6e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUO/pVAAAdtflAAQWm//91+j
j6C////wBAAIAFAEXrrAGtFsADiNITFHqn6E1D1PaU09TxQGgAyepkep5RoBzTEyZNGEwTE0wCYB
DBGBGAaTRPJBoSZlDJtJppkBoDCNGCDQc0xMmTRhMExNMAmAQwRgRgGSATIAmAQgZCYmJMmjQNHp
PURtzH28/kMsNBD5YSQY2wYEgojLRVQTP67Bb0I+YnjfbMZmNlxYKYwnJGatF1DFq/Z4Q4W4IxV9
sVLsX3xJOn8bPNEbzdG58N3LE16thHQshmKXGJh1VufgvCauSzuANgCiollInP0Ikz5BJORC8Yio
WP5A8OhM7CKqi0hzOoaVJlFxh5By4lYIwysofJgG5DklU6IlaiDsW9EG1s8F3gtYnjMsMBaexZAc
xcGSehoN4eA0uCxs3SLpzkZrCGdVNSwDz4DVUiD4LYsurRQljbKs0rUDgVeg/ueWMPUvtv8l2O70
Owa8UocF5uv1JUZwC9ycC/BcFiAspMaXPA09E9CGcNNQ9gkoBRNwdYo3vF9hz2AVA5lUmpAlAZIL
E2RibQRS0GIxzNz2xtSDhQkzEErQsOmUCxS747WyMCs72reIAaGN4/HtkxHmqYgUNX14SkbdG36X
bjVRTcVOIHMGNGcwpEJmGwrVwPHmDMXUCqRkLXQQGMKKEoF5WLk1Lmj3hiuNYQY1zltloNOlUaxc
TaU9M5KRqiFNXG0QFDI5+9jSq9MMoW7IRrBtFDEUNKtgc5ZR6PEAHuSw/IaeGIrlqtfTy8uApO8w
KEvnQIZ3E8vbajWtGQFivQStqkNOs7zxv+vSEe6YLR1qLTlHUoi5DgescdU7gRz8aQ4d3qCaGDl5
dhuDgFrBH5X3htcifu8EKeZLB2/30LN13cfLM+JOrWHyFYx5+viQgpOg1eIlgYJGvQ2HiLtcZIgJ
rpINe9ki5DZv8wsMifOZ5Sob0vZSOV7jmFRZSKzNuNst1nWmBonUAIzONlJcUqX2suCk5EANRCEV
yr8wett7LQltDJYnI6VGJFWltImWbjEAQgiH8yhySpWN/dTv36gTAvIV1jgEEinbry6O3noW5iFI
ef75QO2ahz81KmDN0wL6jb1dAKZAVnETp+P0VOC6JsFLQ1ClFffaUbmKTasuPQBKj+cLWOaRLDiw
dJHD2qEO/tPw1wKb7wR7ZAZkjYDUCcCdQJm4+KiCrkjJZY5TOdUCd5uBGmY+w+IRe/cVGpKpzrO0
NFMvgi0e5B7qF54cVkOi8C8BbFi9he0NN4LkKAeHHh1Z/bsKwQm/KcedK2AmcDiUo9y0QH3INAFQ
HSo1i2ram5UVb9VoUYHpHDrdyuz+mBp+M+yVn3UQBqlMuD8YXLBt3WowI2YFLnkiRxiyPS573khD
jNSXHyB9gX3iZu1mSCq0SIVMaImRkNSgmInqYlClpmICtUlCkdiGuEXGMr0mMJATgMPgWIO5UGm6
c4XZA/UeGnqc5GvDvB749YQ/Ow7EdSKXqgO4MScBSAdqio7wYnuxZGHejIX/8LfpqLuSKcKEgh39
KoA=


--===============1043774365==--