From: marko.makela
Date: October 27 2010 6:54am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3205) Bug#57730
List-Archive: http://lists.mysql.com/commits/122019
X-Bug: 57730
Message-Id: <201010270654.o9R65X0h025771@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0108924753=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDEwMjcwMTQ1NTgtYXg3ZWdp
bWNvNXI4enA0MgoKIDMyMDUgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNwogICAgICBCdWcgIzU3
NzMwIENsZWFuIHVwIHJlZmVyZW5jZXMgdG8gSW5ub0RCIFBsdWdpbgogICAgICAKICAgICAgQ01h
a2VMaXN0cy50eHQ6IFJlbW92ZSB0aGUgY2hlY2tzIGZvciBteXNxbF9zdG9yYWdlX2VuZ2luZS5j
bWFrZQogICAgICBhbmQgTVlTUUxfVkVSU0lPTl9JRC4KICAgICAgCiAgICAgIGhhX2lubm9kYi5j
YywgaGFfaW5ub2RiLmg6IFJlbW92ZSB0aGUgY2hlY2tzIGZvciBNWVNRTF9WRVJTSU9OX0lELgoK
ICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL0NNYWtlTGlzdHMudHh0JwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL0NNYWtlTGlzdHMudHh0
CXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNvbS0yMDEwMTAyNzAxNDU1OC1heDdlZ2ltY281cjh6
cDQyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvQ01ha2VMaXN0cy50eHQJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcwNjU0MjAtenJ1NXB2YzZ1OHNibXJqZwpAQCAtMTMsNyAr
MTMsNyBAQAogIyBhbG9uZyB3aXRoIHRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3cml0ZSB0byB0aGUg
RnJlZSBTb2Z0d2FyZQogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdCwgRmlmdGgg
Rmxvb3IsIEJvc3RvbiwgTUEgIDAyMTEwLTEzMDEgVVNBCiAKLSMgVGhpcyBpcyB0aGUgQ01ha2VM
aXN0cyBmb3IgSW5ub0RCIFBsdWdpbgorIyBUaGlzIGlzIHRoZSBDTWFrZUxpc3RzIGZvciBJbm5v
REIKIAogSU5DTFVERShDaGVja0Z1bmN0aW9uRXhpc3RzKQogSU5DTFVERShDaGVja0NTb3VyY2VD
b21waWxlcykKQEAgLTI1NCwyOSArMjU0LDcgQEAgSUYoV0lUSF9JTk5PREIpCiAgIFNFVChXSVRI
X0lOTk9CQVNFX1NUT1JBR0VfRU5HSU5FIFRSVUUpCiBFTkRJRigpCiAKLQotI1RoZSBwbHVnaW4n
cyBDTWFrZUxpc3RzLnR4dCBzdGlsbCBuZWVkcyB0byB3b3JrIHdpdGggcHJldmlvdXMgdmVyc2lv
bnMgb2YgTXlTUUwuCi1JRihFWElTVFMgJHtTT1VSQ0VfRElSfS9zdG9yYWdlL215c3FsX3N0b3Jh
Z2VfZW5naW5lLmNtYWtlKQotCSMgT2xkIHBsdWdpbiBzdXBwb3J0IG9uIFdpbmRvd3Mgb25seSwg
Ci0JIyB1c2UgdHJpY2tzIHRvIGZvcmNlIGhhX2lubm9kYi5kbGwgbmFtZSBmb3IgRExMCi0JSU5D
TFVERSgke1NPVVJDRV9ESVJ9L3N0b3JhZ2UvbXlzcWxfc3RvcmFnZV9lbmdpbmUuY21ha2UpCi0J
TVlTUUxfU1RPUkFHRV9FTkdJTkUoSU5OT0JBU0UpCi0JR0VUX1RBUkdFVF9QUk9QRVJUWShMSUJf
TE9DQVRJT04gaGFfaW5ub2Jhc2UgTE9DQVRJT04pCi0JSUYoTElCX0xPQ0FUSU9OKQotCQlTRVRf
VEFSR0VUX1BST1BFUlRJRVMoaGFfaW5ub2Jhc2UgUFJPUEVSVElFUyBPVVRQVVRfTkFNRSBoYV9p
bm5vZGIpCi0JRU5ESUYoKQotRUxTRUlGIChNWVNRTF9WRVJTSU9OX0lEIExFU1MgIjUwMTM3IikK
LQkjIFdpbmRvd3Mgb25seSwgbm8gcGx1Z2luIHN1cHBvcnQKLQlJRiAoTk9UIFNPVVJDRV9TVUJM
SUJTKQotCQlBRERfREVGSU5JVElPTlMoLURNWVNRTF9TRVJWRVIpCi0JCUFERF9MSUJSQVJZKGlu
bm9iYXNlIFNUQVRJQyAke0lOTk9CQVNFX1NPVVJDRVN9KQotCQkjIFJlcXVpcmUgbXlzcWxkX2Vy
cm9yLmgsIHdoaWNoIGlzIGJ1aWx0IGFzIHBhcnQgb2YgdGhlIEdlbkVycm9yCi0JCUFERF9ERVBF
TkRFTkNJRVMoaW5ub2Jhc2UgR2VuRXJyb3IpCi0JRU5ESUYoKQotRUxTRSgpCi0JIyBOZXcgcGx1
Z2luIHN1cHBvcnQsIGNyb3NzLXBsYXRmb3JtICwgIGJhc2UgbmFtZSBmb3Igc2hhcmVkIG1vZHVs
ZSBpcyAiaGFfaW5ub2RiIgotCU1ZU1FMX0FERF9QTFVHSU4oaW5ub2Jhc2UgJHtJTk5PQkFTRV9T
T1VSQ0VTfSBTVE9SQUdFX0VOR0lORSAKLQkJREVGQVVMVAotCQlNT0RVTEVfT1VUUFVUX05BTUUg
aGFfaW5ub2RiCi0JCUxJTktfTElCUkFSSUVTICR7WkxJQl9MSUJSQVJZfSkKLUVORElGKCkKK01Z
U1FMX0FERF9QTFVHSU4oaW5ub2Jhc2UgJHtJTk5PQkFTRV9TT1VSQ0VTfSBTVE9SQUdFX0VOR0lO
RSAKKyAgREVGQVVMVAorICBNT0RVTEVfT1VUUFVUX05BTUUgaGFfaW5ub2RiCisgIExJTktfTElC
UkFSSUVTICR7WkxJQl9MSUJSQVJZfSkKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIv
aGFfaW5ub2RiLmNjCXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNvbS0yMDEwMTAyNzAxNDU1OC1h
eDdlZ2ltY281cjh6cDQyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIu
Y2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcwNjU0MjAtenJ1NXB2YzZ1
OHNibXJqZwpAQCAtOTUsMTAgKzk1LDYgQEAgZXh0ZXJuICJDIiB7CiAjICBkZWZpbmUgTVlTUUxf
UExVR0lOX0lNUE9SVCAvKiBub3RoaW5nICovCiAjIGVuZGlmIC8qIE1ZU1FMX1BMVUdJTl9JTVBP
UlQgKi8KIAotI2lmIE1ZU1FMX1ZFUlNJT05fSUQgPCA1MDEyNAotYm9vbCBjaGVja19nbG9iYWxf
YWNjZXNzKFRIRCAqdGhkLCB1bG9uZyB3YW50X2FjY2Vzcyk7Ci0jZW5kaWYgLyogTVlTUUxfVkVS
U0lPTl9JRCA8IDUwMTI0ICovCi0KIC8qKiB0byBwcm90ZWN0IGlubm9iYXNlX29wZW5fZmlsZXMg
Ki8KIHN0YXRpYyBteXNxbF9tdXRleF90IGlubm9iYXNlX3NoYXJlX211dGV4OwogLyoqIHRvIGZv
cmNlIGNvcnJlY3QgY29tbWl0IG9yZGVyIGluIGJpbmxvZyAqLwpAQCAtMTg4NSwxMSArMTg4MSw3
IEBAIGlubm9iYXNlX2NvbnZlcnRfaWRlbnRpZmllcigKIAkJCQlGQUxTRT1pZCBpcyBhbiBVVEYt
OCBzdHJpbmcgKi8KIHsKIAljaGFyIG56W05BTUVfTEVOICsgMV07Ci0jaWYgTVlTUUxfVkVSU0lP
Tl9JRCA+PSA1MDE0MQogCWNoYXIgbnoyW05BTUVfTEVOICsgMSArIEVYUExBSU5fRklMRU5BTUVf
TUFYX0VYVFJBX0xFTkdUSF07Ci0jZWxzZSAvKiBNWVNRTF9WRVJTSU9OX0lEID49IDUwMTQxICov
Ci0JY2hhciBuejJbTkFNRV9MRU4gKyAxICsgc2l6ZW9mIHNydl9teXNxbDUwX3RhYmxlX25hbWVf
cHJlZml4XTsKLSNlbmRpZiAvKiBNWVNRTF9WRVJTSU9OX0lEID49IDUwMTQxICovCiAKIAljb25z
dCBjaGFyKglzCT0gaWQ7CiAJaW50CQlxOwpAQCAtMTkwNywxMyArMTg5OSw5IEBAIGlubm9iYXNl
X2NvbnZlcnRfaWRlbnRpZmllcigKIAkJbnpbaWRsZW5dID0gMDsKIAogCQlzID0gbnoyOwotI2lm
IE1ZU1FMX1ZFUlNJT05fSUQgPj0gNTAxNDEKIAkJaWRsZW4gPSBleHBsYWluX2ZpbGVuYW1lKChU
SEQqKSB0aGQsIG56LCBuejIsIHNpemVvZiBuejIsCiAJCQkJCSBFWFBMQUlOX1BBUlRJVElPTlNf
QVNfQ09NTUVOVCk7CiAJCWdvdG8gbm9fcXVvdGU7Ci0jZWxzZSAvKiBNWVNRTF9WRVJTSU9OX0lE
ID49IDUwMTQxICovCi0JCWlkbGVuID0gZmlsZW5hbWVfdG9fdGFibGVuYW1lKG56LCBuejIsIHNp
emVvZiBuejIpOwotI2VuZGlmIC8qIE1ZU1FMX1ZFUlNJT05fSUQgPj0gNTAxNDEgKi8KIAl9CiAK
IAkvKiBTZWUgaWYgdGhlIGlkZW50aWZpZXIgbmVlZHMgdG8gYmUgcXVvdGVkLiAqLwpAQCAtMTky
NCw5ICsxOTEyLDcgQEAgaW5ub2Jhc2VfY29udmVydF9pZGVudGlmaWVyKAogCX0KIAogCWlmIChx
ID09IEVPRikgewotI2lmIE1ZU1FMX1ZFUlNJT05fSUQgPj0gNTAxNDEKIG5vX3F1b3RlOgotI2Vu
ZGlmIC8qIE1ZU1FMX1ZFUlNJT05fSUQgPj0gNTAxNDEgKi8KIAkJaWYgKFVOSVZfVU5MSUtFTFko
aWRsZW4gPiBidWZsZW4pKSB7CiAJCQlpZGxlbiA9IGJ1ZmxlbjsKIAkJfQoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuaCcKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5oCXJldmlkOmluYWFtLnJhbmFAb3JhY2xlLmNv
bS0yMDEwMTAyNzAxNDU1OC1heDdlZ2ltY281cjh6cDQyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aGFuZGxlci9oYV9pbm5vZGIuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTAy
NzA2NTQyMC16cnU1cHZjNnU4c2JtcmpnCkBAIC0yNzYsMTQgKzI3NiwxMyBAQCBpbnQgdGhkX2Jp
bmxvZ19mb3JtYXQoY29uc3QgTVlTUUxfVEhEIHRoCiAqLwogdm9pZCB0aGRfbWFya190cmFuc2Fj
dGlvbl90b19yb2xsYmFjayhNWVNRTF9USEQgdGhkLCBib29sIGFsbCk7CiAKLSNpZiBNWVNRTF9W
RVJTSU9OX0lEID4gNTAxNDAKIC8qKgogICBDaGVjayBpZiBiaW5hcnkgbG9nZ2luZyBpcyBmaWx0
ZXJlZCBmb3IgdGhyZWFkJ3MgY3VycmVudCBkYi4KICAgQHBhcmFtICB0aGQgICBUaHJlYWQgaGFu
ZGxlCiAgIEByZXR2YWwgMSB0aGUgcXVlcnkgaXMgbm90IGZpbHRlcmVkLCAwIG90aGVyd2lzZS4K
ICovCiBib29sIHRoZF9iaW5sb2dfZmlsdGVyX29rKGNvbnN0IE1ZU1FMX1RIRCB0aGQpOwotI2Vu
ZGlmIC8qIE1ZU1FMX1ZFUlNJT05fSUQgPiA1MDE0MCAqLworCiAvKioKICAgQ2hlY2sgaWYgdGhl
IHF1ZXJ5IG1heSBnZW5lcmF0ZSByb3cgY2hhbmdlcyB3aGljaAogICBtYXkgZW5kIHVwIGluIHRo
ZSBiaW5hcnkuCgo=

--===============0108924753==
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.5-innodb/
# testament_sha1: 3c2435ba661e78f50a5bdfef52b96c19a62f1c2a
# timestamp: 2010-10-27 09:54:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   ax7egimco5r8zp42
# 
# Begin bundle
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


--===============0108924753==--