From: marko.makela
Date: May 12 2010 10:46am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3461 to 3463) Bug#53591
List-Archive: http://lists.mysql.com/commits/108105
X-Bug: 53591
Message-Id: <201005121046.o4CAkZId021934@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1436335074=="

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

IDM0NjMgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMgogICAgICBEb2N1bWVudCB0aGUgQnVnICM1
MzU5MSBmaXggaW4gdGhlIENoYW5nZUxvZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogMzQ2MiBNYXJrbyBNw6RrZWzDpAkyMDEwLTA1LTEyCiAg
ICAgIGhhX2lubm9iYXNlOjphZGRfaW5kZXgoKTogUmVzZXQgdHJ4LT5lcnJvcl9zdGF0ZSBpbiBl
cnJvciBoYW5kbGluZy4KICAgICAgKEJ1ZyAjNTM1OTEpCgogICAgYWRkZWQ6CiAgICAgIG15c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1MzU5MS5yZXN1bHQKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiX2J1ZzUzNTkxLnRlc3QKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVyMGFs
dGVyLmNjCiAzNDYxIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgRG9jdW1lbnQgcmVj
ZW50IGZpeGVzIGluIENoYW5nZUxvZy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL0NoYW5nZUxvZwo9PT0gYWRkZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUzNTkxLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUzNTkxLnJlc3VsdAkxOTcwLTAxLTAxIDAwOjAw
OjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9i
dWc1MzU5MS5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMDQ2
MDMtdmZ3a2d5MmZnanF0b2hpdgpAQCAtMCwwICsxLDE2IEBACitTRVQgR0xPQkFMIGlubm9kYl9m
aWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxl
PW9uOworc2V0IG9sZF9hbHRlcl90YWJsZT0wOworQ1JFQVRFIFRBQkxFIGJ1ZzUzNTkxKGEgdGV4
dCBjaGFyc2V0IHV0Zjggbm90IG51bGwpCitFTkdJTkU9SW5ub0RCIEtFWV9CTE9DS19TSVpFPTE7
CitBTFRFUiBUQUJMRSBidWc1MzU5MSBBREQgUFJJTUFSWSBLRVkoYSgyMjApKTsKK0VSUk9SIEhZ
MDAwOiBUb28gYmlnIHJvdworU0hPVyBXQVJOSU5HUzsKK0xldmVsCUNvZGUJTWVzc2FnZQorRXJy
b3IJMTM5CVRvbyBiaWcgcm93CitFcnJvcgkxMTE4CVJvdyBzaXplIHRvbyBsYXJnZS4gVGhlIG1h
eGltdW0gcm93IHNpemUgZm9yIHRoZSB1c2VkIHRhYmxlIHR5cGUsIG5vdCBjb3VudGluZyBCTE9C
cywgaXMgODEyNi4gWW91IGhhdmUgdG8gY2hhbmdlIHNvbWUgY29sdW1ucyB0byBURVhUIG9yIEJM
T0JzCitFcnJvcgkxMDMwCUdvdCBlcnJvciAxMzkgZnJvbSBzdG9yYWdlIGVuZ2luZQorRFJPUCBU
QUJMRSBidWc1MzU5MTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PUFudGVsb3BlOwor
U0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXRfY2hlY2s9QW50ZWxvcGU7CitTRVQgR0xPQkFM
IGlubm9kYl9maWxlX3Blcl90YWJsZT0wOwoKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3Vp
dGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYl9idWc1MzU5MS50ZXN0JwotLS0gYS9teXNxbC10ZXN0
L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTM1OTEudGVzdAkxOTcwLTAxLTAxIDAw
OjAwOjAwICswMDAwCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9k
Yl9idWc1MzU5MS50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0
NjAzLXZmd2tneTJmZ2pxdG9oaXYKQEAgLTAsMCArMSwyMiBAQAorLS0gc291cmNlIGluY2x1ZGUv
aGF2ZV9pbm5vZGJfcGx1Z2luLmluYworCitsZXQgJGZpbGVfZm9ybWF0PWBzZWxlY3QgQEBpbm5v
ZGJfZmlsZV9mb3JtYXRgOworbGV0ICRmaWxlX2Zvcm1hdF9jaGVjaz1gc2VsZWN0IEBAaW5ub2Ri
X2ZpbGVfZm9ybWF0X2NoZWNrYDsKK2xldCAkZmlsZV9wZXJfdGFibGU9YHNlbGVjdCBAQGlubm9k
Yl9maWxlX3Blcl90YWJsZWA7CisKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSdCYXJy
YWN1ZGEnOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9b247CisKK3NldCBvbGRf
YWx0ZXJfdGFibGU9MDsKKworQ1JFQVRFIFRBQkxFIGJ1ZzUzNTkxKGEgdGV4dCBjaGFyc2V0IHV0
Zjggbm90IG51bGwpCitFTkdJTkU9SW5ub0RCIEtFWV9CTE9DS19TSVpFPTE7CistLSBlcnJvciAx
MzkKK0FMVEVSIFRBQkxFIGJ1ZzUzNTkxIEFERCBQUklNQVJZIEtFWShhKDIyMCkpOworU0hPVyBX
QVJOSU5HUzsKKworRFJPUCBUQUJMRSBidWc1MzU5MTsKKworRVZBTCBTRVQgR0xPQkFMIGlubm9k
Yl9maWxlX2Zvcm1hdD0kZmlsZV9mb3JtYXQ7CitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVf
Zm9ybWF0X2NoZWNrPSRmaWxlX2Zvcm1hdF9jaGVjazsKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJf
ZmlsZV9wZXJfdGFibGU9JGZpbGVfcGVyX3RhYmxlOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9D
aGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIwNjA5MjItb2g3
MTZ1Z3B1a2Zha3d2aAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0NjAzLXZmd2tneTJmZ2pxdG9oaXYK
QEAgLTEsNSArMSwxMSBAQAogMjAxMC0wNS0xMglUaGUgSW5ub0RCIFRlYW0KIAorCSogaGFuZGxl
ci9oYW5kbGVyMGFsdGVyLmNjOgorCUZpeCBCdWcjNTM1OTEgY3Jhc2ggd2l0aCBmYXN0IGFsdGVy
IHRhYmxlIGFuZCB0ZXh0L2Jsb2IgcHJlZml4CisJcHJpbWFyeSBrZXkKKworMjAxMC0wNS0xMglU
aGUgSW5ub0RCIFRlYW0KKwogCSogcm93L3JvdzBtZXJnZS5jOgogCUZpeCBCdWcjNTM0NzEgcm93
X21lcmdlX2Ryb3BfdGVtcF9pbmRleGVzKCkgcmVmZXJzIGZyZWVkIG1lbW9yeSwgU0VHVnMKIAoK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhbmRsZXIw
YWx0ZXIuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhbmRsZXIwYWx0
ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIwNjA5MjItb2g3MTZ1
Z3B1a2Zha3d2aAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYW5kbGVyMGFs
dGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0NjAzLXZmd2tn
eTJmZ2pxdG9oaXYKQEAgLTg5NCw2ICs4OTQsOCBAQCBlcnJvcjoKIAkJcHJlYnVpbHQtPnRyeC0+
ZXJyb3JfaW5mbyA9IE5VTEw7CiAJCS8qIGZhbGwgdGhyb3VnaCAqLwogCWRlZmF1bHQ6CisJCXRy
eC0+ZXJyb3Jfc3RhdGUgPSBEQl9TVUNDRVNTOworCiAJCWlmIChuZXdfcHJpbWFyeSkgewogCQkJ
aWYgKGluZGV4ZWRfdGFibGUgIT0gaW5ub2RiX3RhYmxlKSB7CiAJCQkJcm93X21lcmdlX2Ryb3Bf
dGFibGUodHJ4LCBpbmRleGVkX3RhYmxlKTsKCg==

--===============1436335074==
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-innodb2/
# testament_sha1: 177b92a4452cd02155d036e325d55a108b76ca4a
# timestamp: 2010-05-12 13:46:29 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   oh716ugpukfakwvh
# 
# Begin bundle
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
/8XckU4UJBp5zjIA


--===============1436335074==--