From: marko.makela
Date: November 4 2010 1:12pm
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3656)
List-Archive: http://lists.mysql.com/commits/122881
Message-Id: <201011041312.oA4Bb46Y020468@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0359252410=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTAxMTAzMjI0MTM2LTBvZHZl
d3BtdDFybnZtZDIKCiAzNjU2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTEtMDQKICAgICAgcm93X2lu
c19pbmRleF9lbnRyeSgpOiBOb3RlIHRoYXQgb25seSBDUkVBVEUgSU5ERVggc2V0cyBmb3JlaWdu
PUZBTFNFLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVk
ZS9yb3cwaW5zLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwaW5zLmMKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3JvdzBpbnMuaCcK
LS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvcm93MGlucy5oCXJldmlkOnN1bm55
LmJhaW5zQG9yYWNsZS5jb20tMjAxMDExMDMyMjQxMzYtMG9kdmV3cG10MXJudm1kMgorKysgYi9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9yb3cwaW5zLmgJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMDExMDQxMzEyMTUtcGZ4bnBpZGxyemQ0a3JnMApAQCAtODYsNyArODYs
OCBAQCByb3dfaW5zX2luZGV4X2VudHJ5KAogCWRpY3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46
IGluZGV4ICovCiAJZHR1cGxlX3QqCWVudHJ5LAkvKiE8IGluL291dDogaW5kZXggZW50cnkgdG8g
aW5zZXJ0ICovCiAJdWxpbnQJCW5fZXh0LAkvKiE8IGluOiBudW1iZXIgb2YgZXh0ZXJuYWxseSBz
dG9yZWQgY29sdW1ucyAqLwotCWlib29sCQlmb3JlaWduLC8qITwgaW46IFRSVUU9Y2hlY2sgZm9y
ZWlnbiBrZXkgY29uc3RyYWludHMgKi8KKwlpYm9vbAkJZm9yZWlnbiwvKiE8IGluOiBUUlVFPWNo
ZWNrIGZvcmVpZ24ga2V5IGNvbnN0cmFpbnRzCisJCQkJKGZvcmVpZ249RkFMU0Ugb25seSBkdXJp
bmcgQ1JFQVRFIElOREVYKSAqLwogCXF1ZV90aHJfdCoJdGhyKTsJLyohPCBpbjogcXVlcnkgdGhy
ZWFkICovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCiBJbnNlcnRzIGEgcm93IHRvIGEgdGFibGUuIFRoaXMgaXMgYSBoaWdo
LWxldmVsIGZ1bmN0aW9uIHVzZWQgaW4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vcm93L3JvdzBpbnMuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9y
b3cwaW5zLmMJcmV2aWQ6c3VubnkuYmFpbnNAb3JhY2xlLmNvbS0yMDEwMTEwMzIyNDEzNi0wb2R2
ZXdwbXQxcm52bWQyCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MGlucy5jCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMTA0MTMxMjE1LXBmeG5waWRscnpkNGty
ZzAKQEAgLTIxNjAsNyArMjE2MCw4IEBAIHJvd19pbnNfaW5kZXhfZW50cnkoCiAJZGljdF9pbmRl
eF90KglpbmRleCwJLyohPCBpbjogaW5kZXggKi8KIAlkdHVwbGVfdCoJZW50cnksCS8qITwgaW4v
b3V0OiBpbmRleCBlbnRyeSB0byBpbnNlcnQgKi8KIAl1bGludAkJbl9leHQsCS8qITwgaW46IG51
bWJlciBvZiBleHRlcm5hbGx5IHN0b3JlZCBjb2x1bW5zICovCi0JaWJvb2wJCWZvcmVpZ24sLyoh
PCBpbjogVFJVRT1jaGVjayBmb3JlaWduIGtleSBjb25zdHJhaW50cyAqLworCWlib29sCQlmb3Jl
aWduLC8qITwgaW46IFRSVUU9Y2hlY2sgZm9yZWlnbiBrZXkgY29uc3RyYWludHMKKwkJCQkoZm9y
ZWlnbj1GQUxTRSBvbmx5IGR1cmluZyBDUkVBVEUgSU5ERVgpICovCiAJcXVlX3Rocl90Kgl0aHIp
CS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLwogewogCXVsaW50CWVycjsKCg==

--===============0359252410==
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: 65ff587963eb543ac82b562fe97987165f90a380
# timestamp: 2010-11-04 15:12:27 +0200
# base_revision_id: sunny.bains@stripped\
#   0odvewpmt1rnvmd2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRSbBeQAAj9flEAwcnf/938n
HkC/79/wBAAIAFAEnuywi5uK7tlckuEVJoQap7U0zJop+kjEfpIeptQNBtRj0SeoEqZSaep5E3pU
/VPSaeiaDQAAGgNAAEiUynoRpqep6U/Kmm0nijIGQ000A0AA5gEwEyMAIxMTCYTBDTE0wEkiDTTQ
k8mKZDTU2U9NI0aDRoNBoBgHHgOHH2LzTn0YMN9cT3eHNz61GOULQXMUzvtfU5+22wyLjSNtN/T5
L7So9UiDXfE2Ta3/3+dx1LLoUg/Z4GuEf57zOVlVBfFN8Ao9xo16vWQ857GzV2rGC1DOTlWw7NfO
fC4lLDyG5vRvHMOYoHBbGvYBlhXCFuWIlzQuCRtPUVmJdZYeM0zR0MwiAvmoZ4RJ6FsE2AyFlMPF
Eh0g1DAx2Nc0e4XL0icvIuFCk9u+KFxmQt/cdnpxKUKOE9EwsALK35yaGkDyZfCfVMDwwlqAqGXe
LgSH6DLtuwL9BcMLQDseCnMtNlWpCrKwKVHMJGbFSZiuJAYVrkauLDfaI0YriIewsKwJVJxc1e7x
SzFr5hkTpaVFCKBMvatArUKLCOWyRdIxW9VV94VCXJv0ASrAzwq2p6CDRWYXChXadgEj9GJqWd62
yh0J1QsWoz1ixJjC+8VQp1Gt2iYqOfSUiiQFQTSVr7B5SXYn2kpBAxDSVsFRfvDmMY69WMPRlnrU
SGrk9iSKijnrGBEcsCDppPDIU1ywsIFRSYz8OzfGrormXPZqc8ldUpwDoyarQ1St5i952rLhkGZq
MpGJI/E6Os3ZR0nawQ3uBxUwhAhCElL4vB4PE4uHye9pExPi7ZL2F76DgzspQczdbTCGrR3RSTfM
HXIPV1dI7jDugSm1Tl9/sLNPsplT5MC5T65zNLsoXzoCxZ2e0WTPWdZ2qQpYXnPPpSZMXZYcoVEW
i9hJLWNg/OgyDSd0xPpy7S00xgLK5haLierXzTWO3k2AWSDaRB3UTI1+O4U2SwpoFtUEEMBluN1y
cAZiOplqI0JR5TpKHmqWmxcliLhIuLcBndubWbRNNu65Y5PZCvjIbwZ3k8pA16bLunotI4ExOHAm
MniNZbcjY68V45TvsX7N51GTH9P0OXWYgTmkC0UUudWGQsanliHmqq0avr1otAdtIZqpLETy9fRa
0Y6chRYNbNokLKsNaWpbeRLtTpGGNTlnKU5wewCR2HKEkSckthISYJaPRzAU0LQoREulI0n1OpMj
PjWCvJcRnbKS3qfSEyBkJ5miSCprbsFUqoWHYBUIkcYobGDWtTXDcCircqGSSojhannEpPIS3okI
wcvvXQI4GdebDA5T4gcgHeq8qc8lBILTkclMlPtsWYEN0SkFBepVzy4o2sd1tdBNs8QELAQ+eei/
GFqNqGUOdlCaLBhxEZKINwatcV3BrdJ8lpWixMcCa0ygNfA6y6S6KRRCYgmVSKh65SQiZdo1QDIi
wxFUuTOMoEXX/4fo/xdyRThQkBSbBeQ=


--===============0359252410==--