From: marko.makela
Date: February 16 2011 1:46pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3709 to 3710) Bug#60049
List-Archive: http://lists.mysql.com/commits/131431
X-Bug: 60049
Message-Id: <201102161347.p1GDjMkY024831@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1112982487=="

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

IDM3MTAgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNgogICAgICBNYWtlIHRoZSBpbXBsaWNpdCB1
bnBhY2sgcGFyYW1ldGVyIGV4cGxpY2l0IGluIHRoZSBCdWcgIzYwMDQ5IHRlc3QuCgogICAgbW9k
aWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRl
c3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5
LnRlc3QKIDM3MDkgTWFya28gTcOka2Vsw6QJMjAxMS0wMi0xNQogICAgICBBZGQgYSB0ZXN0IGZv
ciBzdXNwZWN0ZWQgQnVnIzYwMDQ5LgoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L3N1aXRl
L2lubm9kYi9yL2lubm9kYl9idWc2MDA0OS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvdC9pbm5vZGJfYnVnNjAwNDktbWFzdGVyLm9wdAogICAgICBteXNxbC10ZXN0L3N1aXRl
L2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiX3BsdWdpbi9yL2lubm9kYl9idWc2MDA0OS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LW1hc3Rlci5vcHQKICAgICAgbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3Qn
Ci0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAyMTUxMDEyMjctdGp4NHBkbjkwMzhjNWl4
bgorKysgYi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc2MDA0OS50ZXN0CXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMjE2MTMzNDE2LW9pZXU3ZG1jeTlqbG9u
NzcKQEAgLTIzLDEzICsyMywxMyBAQCBvcGVuKEZJTEUsICI8JGZpbGUiKSB8fCBkaWUgIlVuYWJs
ZSB0byBvCiAjIFJlYWQgRElDVF9IRFJfVEFCTEVfSURTLCB0aGUgcm9vdCBwYWdlIG51bWJlciBv
ZiBJRF9JTkQgKFNZU19UQUJMRVMuSUQpLgogc2VlayhGSUxFLCA3KjE2Mzg0KzM4KzM2LCAwKSB8
fCBkaWUgIlVuYWJsZSB0byBzZWVrICRmaWxlIjsKIGRpZSB1bmxlc3MgcmVhZChGSUxFLCAkXywg
NCkgPT0gNDsKLW15ICRzeXNfdGFibGVzX2lkX3Jvb3QgPSB1bnBhY2sgIk4iOworbXkgJHN5c190
YWJsZXNfaWRfcm9vdCA9IHVucGFjaygiTiIsICRfKTsKIHByaW50ICJMYXN0IHJlY29yZCBvZiBJ
RF9JTkQgcm9vdCBwYWdlICgkc3lzX3RhYmxlc19pZF9yb290KTpcbiI7CiAjIFRoaXMgc2hvdWxk
IGJlIHRoZSBsYXN0IHJlY29yZCBpbiBJRF9JTkQuIER1bXAgaXQgaW4gaGV4YWRlY2ltYWwuCiBz
ZWVrKEZJTEUsICRzeXNfdGFibGVzX2lkX3Jvb3QqMTYzODQgKyAxNTIsIDApIHx8IGRpZSAiVW5h
YmxlIHRvIHNlZWsgJGZpbGUiOwogcmVhZChGSUxFLCAkXywgMzIpIHx8IGRpZSAiVW5hYmxlIHRv
IHJlYWQgJGZpbGUiOwogY2xvc2UoRklMRSk7Ci1wcmludCB1bnBhY2soIkgqIiksIlxuIjsKK3By
aW50IHVucGFjaygiSCoiLCAkXyksICJcbiI7CiBFT0YKIAogIyBSZXN0YXJ0IHRoZSBzZXJ2ZXIu
Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5u
b2RiX2J1ZzYwMDQ5LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90
L2lubm9kYl9idWc2MDA0OS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEw
MjE1MTAxMjI3LXRqeDRwZG45MDM4YzVpeG4KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJf
cGx1Z2luL3QvaW5ub2RiX2J1ZzYwMDQ5LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTAyMTYxMzM0MTYtb2lldTdkbWN5OWpsb243NwpAQCAtMjMsMTMgKzIzLDEzIEBAIG9w
ZW4oRklMRSwgIjwkZmlsZSIpIHx8IGRpZSAiVW5hYmxlIHRvIG8KICMgUmVhZCBESUNUX0hEUl9U
QUJMRV9JRFMsIHRoZSByb290IHBhZ2UgbnVtYmVyIG9mIElEX0lORCAoU1lTX1RBQkxFUy5JRCku
CiBzZWVrKEZJTEUsIDcqMTYzODQrMzgrMzYsIDApIHx8IGRpZSAiVW5hYmxlIHRvIHNlZWsgJGZp
bGUiOwogZGllIHVubGVzcyByZWFkKEZJTEUsICRfLCA0KSA9PSA0OwotbXkgJHN5c190YWJsZXNf
aWRfcm9vdCA9IHVucGFjayAiTiI7CitteSAkc3lzX3RhYmxlc19pZF9yb290ID0gdW5wYWNrKCJO
IiwgJF8pOwogcHJpbnQgIkxhc3QgcmVjb3JkIG9mIElEX0lORCByb290IHBhZ2UgKCRzeXNfdGFi
bGVzX2lkX3Jvb3QpOlxuIjsKICMgVGhpcyBzaG91bGQgYmUgdGhlIGxhc3QgcmVjb3JkIGluIElE
X0lORC4gRHVtcCBpdCBpbiBoZXhhZGVjaW1hbC4KIHNlZWsoRklMRSwgJHN5c190YWJsZXNfaWRf
cm9vdCoxNjM4NCArIDE1MiwgMCkgfHwgZGllICJVbmFibGUgdG8gc2VlayAkZmlsZSI7CiByZWFk
KEZJTEUsICRfLCAzMikgfHwgZGllICJVbmFibGUgdG8gcmVhZCAkZmlsZSI7CiBjbG9zZShGSUxF
KTsKLXByaW50IHVucGFjaygiSCoiKSwiXG4iOworcHJpbnQgdW5wYWNrKCJIKiIsICRfKSwgIlxu
IjsKIEVPRgogCiAjIFJlc3RhcnQgdGhlIHNlcnZlci4KCg==

--===============1112982487==
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:46:24 +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=


--===============1112982487==--