From: marko.makela
Date: February 16 2011 1:34pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3710) Bug#60049
List-Archive: http://lists.mysql.com/commits/131421
X-Bug: 60049
Message-Id: <201102161335.p1GDVuXH004128@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1225370369=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNTEwMTIyNy10ang0
cGRuOTAzOGM1aXhuCgogMzcxMCBNYXJrbyBNw6RrZWzDpAkyMDExLTAyLTE2CiAgICAgIE1ha2Ug
dGhlIGltcGxpY2l0IHVucGFjayBwYXJhbWV0ZXIgZXhwbGljaXQgaW4gdGhlIEJ1ZyAjNjAwNDkg
dGVzdC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5v
ZGJfYnVnNjAwNDkudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9p
bm5vZGJfYnVnNjAwNDkudGVzdAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvdC9pbm5vZGJfYnVnNjAwNDkudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDExMDIxNTEwMTIyNy10ang0cGRuOTAzOGM1aXhuCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAyMTYxMzM0MTYtb2lldTdkbWN5OWpsb243NwpAQCAtMjMsMTMgKzIzLDEzIEBAIG9wZW4o
RklMRSwgIjwkZmlsZSIpIHx8IGRpZSAiVW5hYmxlIHRvIG8KICMgUmVhZCBESUNUX0hEUl9UQUJM
RV9JRFMsIHRoZSByb290IHBhZ2UgbnVtYmVyIG9mIElEX0lORCAoU1lTX1RBQkxFUy5JRCkuCiBz
ZWVrKEZJTEUsIDcqMTYzODQrMzgrMzYsIDApIHx8IGRpZSAiVW5hYmxlIHRvIHNlZWsgJGZpbGUi
OwogZGllIHVubGVzcyByZWFkKEZJTEUsICRfLCA0KSA9PSA0OwotbXkgJHN5c190YWJsZXNfaWRf
cm9vdCA9IHVucGFjayAiTiI7CitteSAkc3lzX3RhYmxlc19pZF9yb290ID0gdW5wYWNrKCJOIiwg
JF8pOwogcHJpbnQgIkxhc3QgcmVjb3JkIG9mIElEX0lORCByb290IHBhZ2UgKCRzeXNfdGFibGVz
X2lkX3Jvb3QpOlxuIjsKICMgVGhpcyBzaG91bGQgYmUgdGhlIGxhc3QgcmVjb3JkIGluIElEX0lO
RC4gRHVtcCBpdCBpbiBoZXhhZGVjaW1hbC4KIHNlZWsoRklMRSwgJHN5c190YWJsZXNfaWRfcm9v
dCoxNjM4NCArIDE1MiwgMCkgfHwgZGllICJVbmFibGUgdG8gc2VlayAkZmlsZSI7CiByZWFkKEZJ
TEUsICRfLCAzMikgfHwgZGllICJVbmFibGUgdG8gcmVhZCAkZmlsZSI7CiBjbG9zZShGSUxFKTsK
LXByaW50IHVucGFjaygiSCoiKSwiXG4iOworcHJpbnQgdW5wYWNrKCJIKiIsICRfKSwgIlxuIjsK
IEVPRgogCiAjIFJlc3RhcnQgdGhlIHNlcnZlci4KCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10
ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAwNDkudGVzdCcKLS0tIGEvbXlz
cWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDEyMjctdGp4NHBkbjkwMzhjNWl4bgor
KysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNjAwNDkudGVz
dAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDIxNjEzMzQxNi1vaWV1N2RtY3k5
amxvbjc3CkBAIC0yMywxMyArMjMsMTMgQEAgb3BlbihGSUxFLCAiPCRmaWxlIikgfHwgZGllICJV
bmFibGUgdG8gbwogIyBSZWFkIERJQ1RfSERSX1RBQkxFX0lEUywgdGhlIHJvb3QgcGFnZSBudW1i
ZXIgb2YgSURfSU5EIChTWVNfVEFCTEVTLklEKS4KIHNlZWsoRklMRSwgNyoxNjM4NCszOCszNiwg
MCkgfHwgZGllICJVbmFibGUgdG8gc2VlayAkZmlsZSI7CiBkaWUgdW5sZXNzIHJlYWQoRklMRSwg
JF8sIDQpID09IDQ7Ci1teSAkc3lzX3RhYmxlc19pZF9yb290ID0gdW5wYWNrICJOIjsKK215ICRz
eXNfdGFibGVzX2lkX3Jvb3QgPSB1bnBhY2soIk4iLCAkXyk7CiBwcmludCAiTGFzdCByZWNvcmQg
b2YgSURfSU5EIHJvb3QgcGFnZSAoJHN5c190YWJsZXNfaWRfcm9vdCk6XG4iOwogIyBUaGlzIHNo
b3VsZCBiZSB0aGUgbGFzdCByZWNvcmQgaW4gSURfSU5ELiBEdW1wIGl0IGluIGhleGFkZWNpbWFs
Lgogc2VlayhGSUxFLCAkc3lzX3RhYmxlc19pZF9yb290KjE2Mzg0ICsgMTUyLCAwKSB8fCBkaWUg
IlVuYWJsZSB0byBzZWVrICRmaWxlIjsKIHJlYWQoRklMRSwgJF8sIDMyKSB8fCBkaWUgIlVuYWJs
ZSB0byByZWFkICRmaWxlIjsKIGNsb3NlKEZJTEUpOwotcHJpbnQgdW5wYWNrKCJIKiIpLCJcbiI7
CitwcmludCB1bnBhY2soIkgqIiwgJF8pLCAiXG4iOwogRU9GCiAKICMgUmVzdGFydCB0aGUgc2Vy
dmVyLgoK

--===============1225370369==
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: 90905abd77e4b1afa169bee8228d9ccaba7808a4
# timestamp: 2011-02-16 15:34:30 +0200
# base_revision_id: marko.makela@stripped\
#   tjx4pdn9038c5ixn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX3wl+UAAj/flAAQXHf//1JD
AAS////wBAAIAFAEeeKAJBlQ6ISSUaTaam1HpPT0o/VD9Kep6ENGCYmI0BlSPSPQTQeo0NGEyAMQ
AYmBKagmRI2U9T00TQyAGQ0Mh6gA5gAAAAAAAAAASSTTQaNJgJpMTKn6mp5MU9T0BBiOEz5gR6Pu
V11+RkVxqGagok+8JRfMH2mtB9kLDuOISENt2M2EKMbgxCKyEHmiJEd+yNmTBxusd5wvIQcipg3U
QX7luhueNffvMH9D1K0WEOod49AyV4N4ewep0Mg1w92D7IWp0N+xhDfsfSAG7joirtxhaJR5iUBa
FJKugehSZlUlyc31GcMgLBwDORUxuLopM1sHk4aYRdJAmjRfl8aZilSOKbRHp61aEPq5KMooCc7/
sXeL0B8xiZ7kUtluy0fYBdiNXAIqc+9kUEQGA03GdmXk8LDcFDd2Pf1NencHnxpYQYTbICSLyowH
1OCbFEyhNg5G9Tll3+Skt7omlU5aEI5lw4B6pAocTBoM9XkEriy7EcPKFe2c1QFj1kbWlxCylmFQ
GoXlR+UbjA40IKlZNE4Iupze5jYC20zJt0yHSJ9KQfnuAd8vAVPGMAOhKWhfvlgPYvxgFJib9TEk
nFrKxDEdq4TtKstOwGrrqQ3bcgMi7H/T8l2D0TwrnjOi4vPDMroGSwRWbjtzmxIGcbSRmQfRID8O
mqc1qK5zzKjgGk9pOBSUWmxKa1FhtbQ1Ou4cjKXiaXuc3KM1DVCSXzifIzj3BgHONE3sZpHsLGao
BMdjN4mNjpRzEv06o9BeQlK3CT0fjUS8fQxJ4tadOEgK60B4njfkYHw+G3QmIJW9hxKZOcafIXVB
scT3JHgi0tIrvJeeHdyV4mYS6HsJY7AYe8cut+16+NkprghSDnpZ667MLIZxVMZQ4O5q4BkV1b+w
3vqTAF2JxMZlp/B7cMDsRMR/g51pQi7E4dLu/hQ3VaXJ5cMrO4uHpLMv1MFd+t7rIvI90iTMzgJU
RPeREljyshZFTL8LSYgxlnbNlGFgFNR2OpFApKuvIuSecIVm8v8/JJqMAOK1FMZrmi2z1PZmauR9
4U38aLEVEPK1EhVUemcDGiVKKS5d6MSSeEyIuEHUpEmDyOpXjhqeoHzjAj0QrDB3oJbI5HJMO45L
qB9iwnzc3KMz0/Ii4/RARUhl+xTOitD3ZvHAcwNUOMhMwMu3ZJfEgBhvO0QNklUPAZekA/Ql2RYu
9yvW2UkNswwTLzRPno+rR4JVH80hlYqbJAuyLEpYwmNO1wXySwVIKF0AdBcC9pKawLqjehigOdNC
ChDPd9S2wqNSw6sDmncahaPdCMfgLHkwMxXZyuMEWIkD2B1nG0DH6bChPah1KoRXaSJjxR8S1Ewu
Zcu7qB2tJ4/wVKr2sDnu0XckU4UJB98JflA=


--===============1225370369==--