From: marko.makela
Date: May 24 2010 11:44am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3479 to 3480) Bug#53578
List-Archive: http://lists.mysql.com/commits/109044
X-Bug: 53578
Message-Id: <201005241144.o4OB4x5F012715@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0777872068=="

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

IDM0ODAgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yNAogICAgICBEb2N1bWVudCB0aGUgQnVnICM1
MzU3OCBmaXguCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFu
Z2VMb2cKIDM0NzkgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yNAogICAgICBCdWcjNTM1Nzg6IGFz
c2VydCBvbiBpbnZhbGlkIHBhZ2UgYWNjZXNzLCBpbiBmaWxfaW8oKQogICAgICAKICAgICAgU3Rv
cmUgdGhlIG1heF9zcGFjZV9pZCBpbiB0aGUgZGF0YSBkaWN0aW9uYXJ5IGhlYWRlciBpbiBvcmRl
ciB0byBhdm9pZAogICAgICBzcGFjZV9pZCByZXVzZS4KICAgICAgCiAgICAgIERJQ1RfSERSX01J
WF9JRDogUmVuYW1lZCB0byBESUNUX0hEUl9NQVhfU1BBQ0VfSUQsIERJQ1RfSERSX01JWF9JRF9M
T1cuCiAgICAgIAogICAgICBkaWN0X2hkcl9nZXRfbmV3X2lkKCk6IFJldHVybiB0YWJsZV9pZCwg
aW5kZXhfaWQsIHNwYWNlX2lkIG9yIGEgc3Vic2V0IG9mIHRoZW0uCiAgICAgIAogICAgICBmaWxf
c3lzdGVtX3Q6IEFkZCBpYm9vbCBzcGFjZV9pZF9yZXVzZV93YXJuZWQuCiAgICAgIAogICAgICBm
aWxfY3JlYXRlX25ld19zaW5nbGVfdGFibGVfdGFibGVzcGFjZSgpOiBHZXQgdGhlIHNwYWNlX2lk
IGZyb20gdGhlIGNhbGxlci4KICAgICAgCiAgICAgIGZpbF9zcGFjZV9jcmVhdGUoKTogSXNzdWUg
YSB3YXJuaW5nIGlmIHRoZSBmaWxfc3lzdGVtLT5tYXhfYXNzaWduZWRfaWQKICAgICAgaXMgZXhj
ZWVkZWQuCiAgICAgIAogICAgICBmaWxfYXNzaWduX25ld19zcGFjZV9pZCgpOiBSZXR1cm4gVFJV
RS9GQUxTRSBhbmQgdGFrZSBhIHBvaW50ZXIgdG8gdGhlCiAgICAgIHNwYWNlX2lkIGFzIGEgcGFy
YW1ldGVyLiBNYWtlIHRoZSBmdW5jdGlvbiBwdWJsaWMuCiAgICAgIAogICAgICBmaWxfaW5pdCgp
OiBJbml0aWFsaXplIGFsbCBmaWxfc3lzdGVtIGZpZWxkcyBieSBtZW1femFsbG9jKCkuIFJlbW92
ZQogICAgICBleHBsaWNpdCBpbml0aWFsaXphdGlvbnMgb2YgY2VydGFpbiBmaWVsZHMgdG8gMCBv
ciBOVUxMLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9k
aWN0MGJvb3QuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZGljdC9kaWN0MGNyZWEuYwog
ICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vZmlsL2ZpbDBmaWwuYwogICAgICBzdG9yYWdlL2lu
bm9kYl9wbHVnaW4vaW5jbHVkZS9kaWN0MGJvb3QuaAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVn
aW4vaW5jbHVkZS9maWwwZmlsLmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cw
bXlzcWwuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxv
ZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEwMDUyNDExMDQzOS1mYXppNzBybG10MDd0emQ5CisrKyBiL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA1MjQxMTQzNDktNWthdzUyc3oweWg0c3prYgpAQCAtMSwzICsxLDkgQEAKKzIwMTAtMDUt
MjQJVGhlIElubm9EQiBUZWFtCisKKwkqIGRpY3QvZGljdDBib290LmMsIGRpY3QvZGljdDBjcmVh
LmMsIGZpbC9maWwwZmlsLmMsCisJaW5jbHVkZS9kaWN0MGJvb3QuaCwgaW5jbHVkZS9maWwwZmls
LmgsIHJvdy9yb3cwbXlzcWwuYzoKKwlGaXggQnVnIzUzNTc4OiBhc3NlcnQgb24gaW52YWxpZCBw
YWdlIGFjY2VzcywgaW4gZmlsX2lvKCkKKwogMjAxMC0wNS0xNAlUaGUgSW5ub0RCIFRlYW0KIAkq
IG15c3FsLXRlc3QvaW5ub2RiX2J1ZzQ4MDI0LnRlc3QsIG15c3FsLXRlc3QvaW5ub2RiX2J1ZzQ4
MDI0LnJlc3VsdCwKIAlkaWN0L2RpY3QwZGljdC5jLCBoYW5kbGVyL2hhX2lubm9kYi5jYywgaGFu
ZGxlci9oYV9pbm5vZGIuaCwKCg==

--===============0777872068==
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: 209cbce69fef76c411d27d8db903e54999a02a5a
# timestamp: 2010-05-24 14:44:26 +0300
# base_revision_id: marko.makela@stripped\
#   fazi70rlmt07tzd9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSSS47QAAZRflAAwWnf/918m
BAC/7//wBAAIAFADoy9rtblk06toSSTRqYmVPMhkelTJ6h4hlPU2ptQ2p6J6gSkmJlJ+U2Rqnqek
NomjQNAAA0AZEanqp4T0npE9I0eoMT1AAAAA5gEwAmAAEwABMAASSIGU0wTSYo/QGpimmjNRpk09
TRoYysXU8qXxPTj5GGBG8jRppSjM4ZznUQt3kG9OR6vmxVSvfI7ty92t3Ov79JW+j8/3nMTW2fyW
RSsP8NBbbhX5JzI+c3Q6mh+7Ns+Km6FXQ+nbcIdkNoFIy1aM9FLozwl6w6uvJGqMLyRK+NCMsrF/
cjgSCqpIxmO8A6BHCM7bmPaighhR1wuLahFUKGA0pjRGVQ2xdWd4G4hu6nWgCppXDf4VFklirYUH
yzk847T3N2nvUZt5jFhZtrv5l08KaIYd+15WxXnNGwe7wwSJL7HzIPLXbaU6dQ8wJC5geIFSoCwW
QUG92CDMczGoOXhYtNaCBASahFQSKMGfgJlUWnMUv9o25HFUXIPfEXmbgrzT7hgeZmGCES6qZiUE
4WQeuLNCt7DIQm5JVm/eXZSLDQXYSK3XTFc7AkpGpstRUUClVEFpuEZxdzZVGuA53lUxHmVF22FR
KBRpAjY1IPIO3FsqWp0Ciy1qq7EWPJXJqGlIBPQ20zcqqyPc80b++03pHrClkx+sp1KI64WnmxCR
PcPkyWRkDz2PJLpA43EEjjrxtw8UijvkqeGpI+22GXLMsijQj3oSK2X3FuyJwbhtue3YXbDXxo5G
xYrwWUvrKzI1JNIZCb5fSD6aPhgxI5khxFIsrahPoxXeXaZJxtdFK0VaakakNhaULykCZnNiaSEO
I8uV6kQmKqoxUr+DNhfqyZ9aqoJFQa5fkXDjHTcSua6U1unlaTq44ArqzmmTZL7+w1Xmq+JEJ06B
sxMXk9xntNpJp3cF840EpST2Ehw4Dfvi42MRO3iw1ZKmDWY+YmwD2Wr60ymutXzFXyXcfDBG2PZN
ieRQONB9WqCqf1k1XS5M4WHjyDt6WTXaDEUBa0j2hSGkFw9GDAKQpcD2SGpSGIluEFPMW9O6MMUj
FI0BsHKEXTkLyjlGfCuhhM4uGIwoMAYIpf8hsEwVQoGve5kh8lfm53utQLLQG3oTHVI5hlXi5XKU
oOyIvRCoZ9EcePRnLkm0ziQ/HYH1sAdJpNs2t2sKQ4GK4M6NUjOaegGmXjwxFbQRYLmJ+iJWZi5M
pX9S1qsxuaaEcpQEAeyu4ryzZD0G12RfAH3g/KVCpHrZWoizZrqhT51QOXAeKn/Ffr/xdyRThQkC
SS47QA==


--===============0777872068==--