From: marko.makela
Date: November 11 2010 9:39am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3655)
List-Archive: http://lists.mysql.com/commits/123546
Message-Id: <201011110939.oAB93iSR011236@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2056510674=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpqaW1teS55YW5nQG9yYWNsZS5jb20tMjAxMDExMTEwNTMyMTItbG81bm1i
bjhobnJqa3dtMAoKIDM2NTUgTWFya28gTcOka2Vsw6QJMjAxMC0xMS0xMQogICAgICBEZWNsYXJh
dGlvbnMgYW5kIGNvZGUgZG8gbm90IG1peCBpbiBDOTAsIG5vdCBldmVuIHdpdGhpbiBVTklWX0RF
QlVHLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBm
bHUuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGZsdS5jJwotLS0gYS9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBmbHUuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNsZS5j
b20tMjAxMDExMTEwNTMyMTItbG81bm1ibjhobnJqa3dtMAorKysgYi9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vYnVmL2J1ZjBmbHUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTEx
MTA5MzkwOS0yZTB0dHJwbGd4eG5vN3BoCkBAIC0xNzEwLDkgKzE3MTAsOSBAQCBidWZfZmx1c2hf
dmFsaWRhdGVfbG93KHZvaWQpCiAJCXV0X2Eob20gPiAwKTsKIAogCQlpZiAoVU5JVl9MSUtFTFlf
TlVMTChidWZfcG9vbC0+Zmx1c2hfcmJ0KSkgeworCQkJYnVmX3BhZ2VfdCogcnBhZ2U7CiAJCQl1
dF9hKHJub2RlKTsKLQkJCWJ1Zl9wYWdlX3QqIHJwYWdlID0gKnJidF92YWx1ZShidWZfcGFnZV90
KiwKLQkJCQkJCSAgICAgICBybm9kZSk7CisJCQlycGFnZSA9ICpyYnRfdmFsdWUoYnVmX3BhZ2Vf
dCosIHJub2RlKTsKIAkJCXV0X2EocnBhZ2UpOwogCQkJdXRfYShycGFnZSA9PSBicGFnZSk7CiAJ
CQlybm9kZSA9IHJidF9uZXh0KGJ1Zl9wb29sLT5mbHVzaF9yYnQsIHJub2RlKTsKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMnCi0tLSBhL3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwlyZXZpZDpqaW1teS55YW5nQG9yYWNs
ZS5jb20tMjAxMDExMTEwNTMyMTItbG81bm1ibjhobnJqa3dtMAorKysgYi9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDExMTEwOTM5MDktMmUwdHRycGxneHhubzdwaApAQCAtMzM1LDEwICszMzUsMTMgQEAgcndfbG9j
a192YWxpZGF0ZSgKIC8qPT09PT09PT09PT09PSovCiAJcndfbG9ja190Kglsb2NrKQkvKiE8IGlu
OiBydy1sb2NrICovCiB7CisJdWxpbnQJd2FpdGVyczsKKwlsaW50CWxvY2tfd29yZDsKKwogCXV0
X2EobG9jayk7CiAKLQl1bGludCB3YWl0ZXJzID0gcndfbG9ja19nZXRfd2FpdGVycyhsb2NrKTsK
LQlsaW50IGxvY2tfd29yZCA9IGxvY2stPmxvY2tfd29yZDsKKwl3YWl0ZXJzID0gcndfbG9ja19n
ZXRfd2FpdGVycyhsb2NrKTsKKwlsb2NrX3dvcmQgPSBsb2NrLT5sb2NrX3dvcmQ7CiAKIAl1dF9h
ZChsb2NrLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAJdXRfYSh3YWl0ZXJzID09IDAg
fHwgd2FpdGVycyA9PSAxKTsKCg==

--===============2056510674==
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.1-innodb/
# testament_sha1: 148ceed4f2a29c5796743fec9a191070a61a677e
# timestamp: 2010-11-11 11:39:29 +0200
# base_revision_id: jimmy.yang@stripped\
#   lo5nmbn8hnrjkwm0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWtS+QYAAk9flEAwUnf//1+j
AwC//9/wBAAIAFAEuXujjNN3SSTNR4SSRPSp7KeJMp+0U2SaPSR6j9U/RQeo0aNM9FAlIgYQ1PTU
0TZTJoaAAAAABJEBQeiGiT9BJ6gPSD1NGQxAAHMABMmABMJgmEMARgASSJoamRptTEGlNpianpqa
GTEAaAXJECCY+zuPA2mrU8MOECjOeHadZTFluMN+USsWnTdKNd843vx2FjIMzDMHh8kW1yqxZrr6
Qa9xmnmndHG9unLl50QZ0UdDH65x86n1F83pEiLc+IJ9G/sR5au0eUoHMi1QGUxLjdkhNaQyZoi9
ELKB9hMKONQmR+GvUksGQf9filKVIRPDFEGI0vITUls4GtSC3rtEnoWoTcM465y3P0Ydq0irgwDw
I5SZky16yo1Om7hUE6sUgIJEiWdwVsM3tjuyoXvaNt/6MOcEidkhkh8zhcyxeNdUJFMsCPoEVR+6
4F0MDzFgip0et4Y2NZcMLDZakWYLtqE81luIPQiOZTGVRUtBG34sM3aIgPtsBpu3cdMCtdEyT4aV
eRRxtB4YExVwAqmFuKlpmskfujyyXhsZ76TKSOE4btLqqSFaNaogleYSBUarZMTLQX1mcaWkSxNK
O26pTlUmjBKYJdKwSJPM/RsRk7WVveZHZliLmiUmEVhPsLsKBYETngWmDNOjqeLAsUS8UnkqS40a
AdpHZqrs4GNtxlscJiJG6jRQsZRkZGYibEqiBERfiywBy6QHiOL8pnowotIGI1yL45oNQcqm906q
IJJK4qrg1WmsiK5GyC9vZqud+xcA5wC0xmxIP5PSerp0C2GSZBJOzMMzeRRlu/b84j19c0kV7vTL
GuVmgyL/Ax8pwgMUJ4uG0VpOPHDb+SR/eJ4+AlS7Kz0MUrakcemo0yQ/C7qZkukwlJr+Yuv6y4GP
UV1ijMOHHCleGjojhlz8TigYLuqlxATJ0VDHJhdd8QvgLULxeR4adg5gi8S67BLDCmfno5Y51mMz
lSE4NnyEEWYi6nGgleK83q+NHwr4mpzgDtA3+ZKT5pinNSXP6HEitbezpx6UxhL9L9ve9a4zV7Jt
LS5OOALGCZMFVXt3MrrbCF2dF8iM1ymFucnHuH3nb3jDnlorcxXAaRTQLV/TkSJltcescuQjy7AN
aN7DYiofr5KtJxLEr51oaGxXCcfRWnZwRXTI6YShoRVxRgvDgQMmO2SVQWusTErSsEyRzsRIC0wX
YGhGhySz7BhJguAx7p4OmVltMhvn2KWjFCqTYJFh+TimHbbFaspHoN+rnnipzU1BXSOKZVPgKpNH
XJ4LHaLyqP8Av0ZjnyWaheJmBljy6mSN6zAO4n8zZ3SVEe9nn4EuiNyqXJ6iZtkonE2vGCZQ7wJw
I6p9l6oSDph+oK0Ep9VlW6amCopXyz8oxAqE3F7lGCvysQ6UZTrYrNKGJzaxOQF5I51FuUiPexvC
+OZ9WVZw6nRqtsHxRWEQJhQeFEgIrvk6wC7GIq5SrTI8ILm1M7aJ+CmWe8CZHiBSbk3cuuwWqKp/
wjbyLuSKcKEg1qXyDA==


--===============2056510674==--