From: marko.makela
Date: May 20 2010 1:10pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3474 to 3475)
List-Archive: http://lists.mysql.com/commits/108787
Message-Id: <201005201310.o4KCrfLF031464@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0655499898=="

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

IDM0NzUgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yMAogICAgICBidWZfTFJVX2ZyZWVfYmxvY2so
KTogQ29ycmVjdCBhbiBlcnJvciBpbiB0aGUgY29tbWVudC4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMKICAgICAgc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2luY2x1ZGUvYnVmMGxydS5oCiAzNDc0IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMjAK
ICAgICAgQnVnIzUzNTkzOiBBZGQgc29tZSBpbnN0cnVtZW50YXRpb24gdG8gaW1wcm92ZSBWYWxn
cmluZCBzZW5zaXRpdml0eQogICAgICAKICAgICAgQlVJTEQvKjogQWRkIHZhbGdyaW5kX2NvbmZp
Z3M9LS13aXRoLXZhbGdyaW5kLgogICAgICBCVUlMRC8qOiBSZW1vdmUgLVVTQUZFTUFMTE9DIGZy
b20gdmFsZ3JpbmRfZmxhZ3MuCiAgICAgIAogICAgICBjb25maWd1cmUuaW46IEFkZCBBQ19BUkdf
V0lUSCh2YWxncmluZCkgYW5kIEhBVkVfVkFMR1JJTkQuCiAgICAgIAogICAgICBpbmNsdWRlL215
X3N5cy5oOiBEZWZpbmUgYSBudW1iZXIgb2YgTUVNXyB3cmFwcGVycyBmb3IgVkFMR1JJTkRfIGZ1
bmN0aW9ucy4KICAgICAgaW5jbHVkZS9teV9zeXMuaDogTWFrZSBUUkFTSCBkbyBNRU1fVU5ERUZJ
TkVEKCkuCiAgICAgIAogICAgICBpbmNsdWRlL21fc3RyaW5nLmg6IFJlbW92ZSB1bnVzZWQgbWFj
cm8gYnplcm9faWZfcHVyaWZ5KEEsQikuCiAgICAgIAogICAgICBfbXltYWxsb2MoKTogRGVjbGFy
ZSBNRU1fVU5ERUZJTkVEKCkgb24gdGhlIGFsbG9jYXRlZCBtZW1vcnkuCiAgICAgIAogICAgICBf
bXlmcmVlKCk6IERlY2xhcmUgTUVNX05PQUNDRVNTKCkgb24gdGhlIGZyZWVkIG1lbW9yeS4KICAg
ICAgCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2Lmk6IEVuYWJsZSBVTklWX0RF
QlVHX1ZBTEdSSU5EIGJhc2VkIG9uCiAgICAgIEhBVkVfVkFMR1JJTkQgcmF0aGVyIHRoYW4gSEFW
RV9wdXJpZnkuCiAgICAgIAogICAgICBQb3NzaWJsZSB0aGluZ3MgdG8gZG86CiAgICAgICAqIElu
IG15X2dsb2JhbC5oLCByZW1vdmUgdGhlIGRlZmluZWQoSEFWRV9wdXJpZnkpIGNvbmRpdGlvbgog
ICAgICAgICBmcm9tIHRoZSBfV0lOMzIgdWludDNrb3JyKCkuCiAgICAgICAqIEluIG15X2dsb2Jh
bC5oICppbnQqa29ycigpLCB1c2UgfCBpbnN0ZWFkIG9mICsKICAgICAgICAgaW4gb3JkZXIgdG8g
a2VlcCB0aGUgVmFsZ3JpbmQgViBiaXRzIGFjY3VyYXRlCiAgICAgICAqIENvbnNpZGVyIHJlcGxh
Y2luZyBIQVZFX3B1cmlmeSB3aXRoIEhBVkVfVkFMR1JJTkQKICAgICAgICogVXNlIFZBTEdSSU5E
X0NSRUFURV9CTE9DSywgVkFMR1JJTkRfRElTQ0FSRCBpbiBtZW1fcm9vdCBhbmQgc2ltaWxhciBw
bGFjZXMKCiAgICBtb2RpZmllZDoKICAgICAgQlVJTEQvU0VUVVAuc2gKICAgICAgQlVJTEQvYnVp
bGRfbWNjZ2Uuc2gKICAgICAgQlVJTEQvY29tcGlsZS1hbWQ2NC12YWxncmluZC1tYXgKICAgICAg
QlVJTEQvY29tcGlsZS1wZW50aXVtLWljYy12YWxncmluZC1tYXgKICAgICAgQlVJTEQvY29tcGls
ZS1wZW50aXVtLXZhbGdyaW5kLW1heAogICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3Jp
bmQtbWF4LW5vLW5kYgogICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1tYXgK
ICAgICAgY29uZmlndXJlLmluCiAgICAgIGluY2x1ZGUvbV9zdHJpbmcuaAogICAgICBpbmNsdWRl
L215X3N5cy5oCiAgICAgIG15c3lzL3NhZmVtYWxsb2MuYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3VuaXYu
aQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTA0MDQyLW1hMm5zc2NxZHZ3b3BoOGsKKysrIGIvc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA1MjAxMzA3MzQtdWVvdzltbjYwY3pwN280bQpAQCAtMTM2NCw3ICsxMzY0LDcg
QEAgYnVmX0xSVV9tYWtlX2Jsb2NrX29sZCgKIFRyeSB0byBmcmVlIGEgYmxvY2suICBJZiBicGFn
ZSBpcyBhIGRlc2NyaXB0b3Igb2YgYSBjb21wcmVzc2VkLW9ubHkKIHBhZ2UsIHRoZSBkZXNjcmlw
dG9yIG9iamVjdCB3aWxsIGJlIGZyZWVkIGFzIHdlbGwuCiAKLU5PVEU6IElmIHRoaXMgZnVuY3Rp
b24gcmV0dXJucyBCVUZfTFJVX0ZSRUVELCBpdCB3aWxsIG5vdCB0ZW1wb3JhcmlseQorTk9URTog
SWYgdGhpcyBmdW5jdGlvbiByZXR1cm5zIEJVRl9MUlVfRlJFRUQsIGl0IHdpbGwgdGVtcG9yYXJp
bHkKIHJlbGVhc2UgYnVmX3Bvb2xfbXV0ZXguICBGdXJ0aGVybW9yZSwgdGhlIHBhZ2UgZnJhbWUg
d2lsbCBubyBsb25nZXIgYmUKIGFjY2Vzc2libGUgdmlhIGJwYWdlLgogCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnVmMGxydS5oJwotLS0gYS9zdG9y
YWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwbHJ1LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMDA1MjAxMDQwNDItbWEybnNzY3FkdndvcGg4aworKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vaW5jbHVkZS9idWYwbHJ1LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMDA1MjAxMzA3MzQtdWVvdzltbjYwY3pwN280bQpAQCAtOTYsNyArOTYsNyBAQCBidWZf
TFJVX2luc2VydF96aXBfY2xlYW4oCiBUcnkgdG8gZnJlZSBhIGJsb2NrLiAgSWYgYnBhZ2UgaXMg
YSBkZXNjcmlwdG9yIG9mIGEgY29tcHJlc3NlZC1vbmx5CiBwYWdlLCB0aGUgZGVzY3JpcHRvciBv
YmplY3Qgd2lsbCBiZSBmcmVlZCBhcyB3ZWxsLgogCi1OT1RFOiBJZiB0aGlzIGZ1bmN0aW9uIHJl
dHVybnMgQlVGX0xSVV9GUkVFRCwgaXQgd2lsbCBub3QgdGVtcG9yYXJpbHkKK05PVEU6IElmIHRo
aXMgZnVuY3Rpb24gcmV0dXJucyBCVUZfTFJVX0ZSRUVELCBpdCB3aWxsIHRlbXBvcmFyaWx5CiBy
ZWxlYXNlIGJ1Zl9wb29sX211dGV4LiAgRnVydGhlcm1vcmUsIHRoZSBwYWdlIGZyYW1lIHdpbGwg
bm8gbG9uZ2VyIGJlCiBhY2Nlc3NpYmxlIHZpYSBicGFnZS4KIAoK

--===============0655499898==
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/mysql/5.1-innodb/
# testament_sha1: 31da17b1da17a40ec1a839ba51ee5911dc9ed38e
# timestamp: 2010-05-20 16:10:42 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   ma2nsscqdvwoph8k
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbcRHp0AAlZfgEAQW2f//18n
lgC/7//wUASM5c9rTend69UN29PCSRKemQnpM1M2qPKep6mm1PKAAAyBoElRop6nmJGp5NT1GmaT
TamnqHqNA0A0AJFNEajSYj1T8plHpNDNQBoyD1Gh+pqAbUiEeoTYjKGnoTRiGg9JoDBDICSSGRT2
QnqaAU8pvQp6jJkMgAGg3chPTtYb37fY86Y1QmWNpYp4RRkYJ9VVMUstWB9cudZC8bab/HBGU7Ga
dWpzc4c3DyPQsa8Lhmzv1FT75R1FkiGVGd7P0MIgkXGvboxv28/Q3n5umnSbKSn7QHYLjwWdOJFB
OL/rZzRNP26VAKbCRuCYIrAUT5GKHpLBTS+5+FAhjIIlV4hikVYuq3ICZmmaWYQ0l5EmBOOiklrU
yAXXvISZMYFFjSaiQF3WlYJ4GG+0FsgTTVrgcyJJk5lbRNkkAevhPTIy/uFjlxXvhaypyiS3is3V
FWKiV3Cq0KFIinaaTYSF5C95rxoMyUhyKfFhm8RFQWLbaaxxWBnHyTEb7aQxlUrapQHiwOvPynlp
yATkmXKSqSHIpL53G8hI8tapLzYlEpPQB5a5HjdhcwLLUb9ecxwUhXNSMSkIlKQDDgSqZWqIKHaw
HtcY4wcOLEsCkmQBkth/L07CZBKsqPjERoV5UOLHoIlFzhWnECUasbb4JSGNyTynAm+456h97ZiR
QOPOr51G8ErSVhUaVDdoseGkZmOoqXGAH14EcxdCD4ZoJlQEUixojlkE7rZoehvMlYxpMktINIRX
son5hrz+pfD3xbIsiUcotyFLkGNj3G1syIkZHE4mYRaQndaeB+zwXE3lyuKHr1Rsk3emJ3+zCgQi
tNq40rjKTEJpMEKM/tGhCtNRLnKCND0LbSp8KjPbECg+9gBt7ks5sNLkmMrMvDehzDdPVzSZWwo8
A0BpUoXQqXtOrPRqdzv1OEPH3RFSxFqNVgOn1kyRzIlYYEysKNOvADEnkYpaTSpK5LasHiuS0zJk
lruGjdcT3GpbSeq9w7EokaSaYvfY4sMwlaRpPkmFqAsvfx5agu3mEU+1IrRRP+kpsXJaHCfQPNXK
SEfkUJVnCsy1lpQocTl0WuNWFLc+qzn2LVDrTuAm3xc4vQ3AjPACk8ynil9CsqMTuXJEc3610PnW
MBHmakFRyqOmjo2kTOPLehakYiUDKwGQthYhMiDGXbkLKyAPO8XahMbVxQsMu9j6jgYmsFpo3xKI
npAfYsTvxrg9h251gDJblN6kOZMKNn34kPqzXlWSojZDEWVBoSXZVCGPCBBI0xIkV8O5CuR0k6/Y
WLJQA9oDrLFbbnCmNTJMR1wgN8NChFt16cIOAxox6PAzEexxJlR1PeAZlpMJ6w0UtTZ4xWChXmBQ
mN4oxhrOqIGVBs5PK00ErtNhTV4SeUH+CTZyTA9lfgOIkEVhITFTBKRQBt9lq4gbRG1PFbeVWqHX
agf1LFblAynfzKRGEmmZm0GidWPrkoAz/4u5IpwoSFuIj06A


--===============0655499898==--