From: marko.makela
Date: June 22 2010 10:34am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3111)
List-Archive: http://lists.mysql.com/commits/111748
Message-Id: <201006221035.o5MAFIYN019183@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0495968583=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYyMjA3NTgyMi0zM2xl
OTQwcDNlazhycDQ2CgogMzExMSBNYXJrbyBNw6RrZWzDpAkyMDEwLTA2LTIyCiAgICAgIGJ1Zl9m
bHVzaF9pbnNlcnRfaW5fZmx1c2hfcmJ0KCksIGJ1Zl9mbHVzaF92YWxpZGF0ZV9sb3coKToKICAg
ICAgU2lsZW5jZSBHQ0Mgd2FybmluZ3MgYWJvdXQgZGVyZWZlcmVuY2luZyBhIHR5cGUtcHVubmVk
IHBvaW50ZXIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBm
bHUuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGZsdS5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA2MjIwNzU4MjItMzNsZTk0MHAzZWs4cnA0NgorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2J1Zi9idWYwZmx1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2
MjIxMDM0NTAtYWFndDJ0aDBqNHYzaGk5bgpAQCAtMTE0LDcgKzExNCw5IEBAIGJ1Zl9mbHVzaF9p
bnNlcnRfaW5fZmx1c2hfcmJ0KAogCXBfbm9kZSA9IHJidF9wcmV2KGJ1Zl9wb29sLT5mbHVzaF9y
YnQsIGNfbm9kZSk7CiAKIAlpZiAocF9ub2RlICE9IE5VTEwpIHsKLQkJcHJldiA9ICpyYnRfdmFs
dWUoYnVmX3BhZ2VfdCosIHBfbm9kZSk7CisJCWJ1Zl9wYWdlX3QqKgl2YWx1ZTsKKwkJdmFsdWUg
PSByYnRfdmFsdWUoYnVmX3BhZ2VfdCosIHBfbm9kZSk7CisJCXByZXYgPSAqdmFsdWU7CiAJCXV0
X2EocHJldiAhPSBOVUxMKTsKIAl9CiAKQEAgLTIwODgsMTMgKzIwOTAsMTMgQEAgYnVmX2ZsdXNo
X3ZhbGlkYXRlX2xvdygKIAkJdXRfYShvbSA+IDApOwogCiAJCWlmIChVTklWX0xJS0VMWV9OVUxM
KGJ1Zl9wb29sLT5mbHVzaF9yYnQpKSB7Ci0JCQlidWZfcGFnZV90KiBycGFnZTsKKwkJCWJ1Zl9w
YWdlX3QqKiBwcnBhZ2U7CiAKIAkJCXV0X2Eocm5vZGUpOwotCQkJcnBhZ2UgPSAqcmJ0X3ZhbHVl
KGJ1Zl9wYWdlX3QqLCBybm9kZSk7CisJCQlwcnBhZ2UgPSByYnRfdmFsdWUoYnVmX3BhZ2VfdCos
IHJub2RlKTsKIAotCQkJdXRfYShycGFnZSk7Ci0JCQl1dF9hKHJwYWdlID09IGJwYWdlKTsKKwkJ
CXV0X2EoKnBycGFnZSk7CisJCQl1dF9hKCpwcnBhZ2UgPT0gYnBhZ2UpOwogCQkJcm5vZGUgPSBy
YnRfbmV4dChidWZfcG9vbC0+Zmx1c2hfcmJ0LCBybm9kZSk7CiAJCX0KIAoK

--===============0495968583==
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: 05f543a66fa3375f5b98be34a5a52be0023e8bdc
# timestamp: 2010-06-22 13:35:01 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   33le940p3ek8rp46
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX4zl4oAAcxflAAwUnf//1uC
CAC//9/wBAAIAFAD+SatGe4CzqcJKENCMSfog01M1GaCjaIep6TT1P1IDJNEwI0DSm0kyeiAaZAB
iMCRTQSaNCaPUameomTI8pkyHpBkAcwAAAAAAAAAAJKU00YQ9QD1NGgAAAAANDbTaVsDm1a5Ec8g
fDgb+a1iWt9GCRtrolFqlIlHTxX7W2jR5Bb8UuZl1V0To+l1KVpE/76+QY/T02e3VXt89dEndrr5
hxGw69NWs7WXXTg1gVKM8MchA4enMcEB4OI8IiZbO4jBfpearFQoUcPjNsfEzFRJG3huET8jzVhB
xXilp1zEb9cCMlOTSpNakjIrLpsrbpKGEoaalInHitqxFRYGhobr2XCNN4t+PX+j3xPUTLXRNpM1
s2GA6j+RX/Td+ikvx0rigkhtou7hQ8ygmMKYc7OOBRJNBF8Dngcmy5aaVDb5vzRq5j2GQ6wcY00s
kQkHDU5A8XRV5gBYJxP0B2K0oLJFoF7qDS2UTJ1E0rMyYV4ihbdtcK4oqkIbUwztrWpO0zAbrFLj
iLhLSLzBnPJSRomCUN+BxmWMEEWdBC+qFqnA47nd8AgjO+80QNaZ7F7FMQpmgQvfG6o0Hu5G7Jxr
nPDyTgpqtdiyuzDenDMV5A/J1KsMFuXfKsrYBEFJJ3OhcFrntV5qTOBznizs5CphuinV3d+pd3WI
wzgz8/P1nZGfJ21nbrcrRLvhG6gRwdCgSkQfB4I5co5YITEI0CzRt1JE6e8DWTQYDhSCLeDEZ7Hy
PRjKI/LC9nOxU6DisB+SvZSsUb3Rfw9zpuSYVKrWdA9kQMF4LX2ZsZY1iRbQkQwoM19pmw15aqVJ
KoDvWQO2Cnae1d2pbiOVmn4LuTh0Bj4gTbLhmmkfIpR/LB8xxa+QHMCYuhlp0czbfpkZr4VS7Uxv
3ZP3adUiuVeiYq7LdTW6d5dsuJkVSp3ipkxc+G2w8iMVq4mY0VGPHB69V4uKRu8Sbnc4W/OLUNYi
h94soronmAshk40q9smssXy4g/zCmGSeeTl9dNk2cN4eTYWippJllSCPbQckaXwiCKYJSwpDJUwi
G3o4LifQ1mxSNAjjXmdo5cvEs0aTHNOZ4FGTbJPLRVzDlpWF0X7AiuycYvMNptNbMkiydfhYFUN0
z0SOQEpGCmvZTdLdJmbBDcmQGzUNw8JNpr9Xp4h3NvoBmSWnCpMojPf1ULq2skQnPjnd4JhYtRNb
5e6efHI1UT4gJAe9IBxFYZPAlQFzgu3kHjBlzp5jfsBdnLASAiAwqw5RickIvAPO86ycZ8Br9wVs
1Am9TIEdN/4iChZ5LKyP/FXv/xdyRThQkH4zl4o=


--===============0495968583==--