From: marko.makela
Date: April 12 2011 8:11am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3364 to 3365)
 Bug#12329920
List-Archive: http://lists.mysql.com/commits/135232
X-Bug: 12329920
Message-Id: <201104120811.p3C8BYFa022615@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1465563252=="

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

IDMzNjUgTWFya28gTcOka2Vsw6QJMjAxMS0wNC0xMgogICAgICBCdWcgIzEyMzI5OTIwIEFTU0VS
VCBVVF9FUlJPUiBJTiBTWU5DX1RIUkVBRF9MRVZFTFNfTk9ORU1QVFlfVFJYCiAgICAgIFNSVl9D
T05DX0ZPUkNFX0VYSVRfSU5OT0RCCiAgICAgIAogICAgICBUaGlzIGlzIGEgYm9ndXMgVU5JVl9T
WU5DX0RFQlVHIGFzc2VydGlvbiBmYWlsdXJlIHRoYXQgSSBpbnRyb2R1Y2VkCiAgICAgIHdoZW4g
aW50cm9kdWNpbmcgYXNzZXJ0aW9ucyBmb3IgY2hlY2tpbmcgdGhhdCBJbm5vREIgaXMgbm90IGhv
bGRpbmcKICAgICAgYW55IG11dGV4ZXMgb3IgcnctbG9ja3Mgd2hlbiByZXR1cm5pbmcgY29udHJv
bCB0byBNeVNRTC4KICAgICAgCiAgICAgIHNydl9zdXNwZW5kX215c3FsX3RocmVhZCgpOiBSZWxl
YXNlIGRpY3Rfb3BlcmF0aW9uX2xvY2sgYmVmb3JlCiAgICAgIGludm9raW5nIHNydl9jb25jX2Zv
cmNlX2V4aXRfaW5ub2RiKCksIHdoaWNoIHdvdWxkIG5vdyBjaGVjayB0aGF0IHRoZQogICAgICB0
aHJlYWQgaXMgbm90IGhvbGRpbmcgYW55IG11dGV4ZXMgb3IgcnctbG9ja3MuICBBZnRlciByZXN1
bWluZywgY2hlY2sKICAgICAgc3luY190aHJlYWRfbGV2ZWxzX25vbmVtcHR5X3RyeCgpIGFuZCBk
byBzcnZfY29uY19mb3JjZV9lbnRlcl9pbm5vZGIoKQogICAgICBiZWZvcmUgcmVhY3F1aXJpbmcg
dGhlIGRpY3Rfb3BlcmF0aW9uX2xvY2suCiAgICAgIAogICAgICByYjo2NDYgYXBwcm92ZWQgYnkg
U3VubnkgQmFpbnMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2
MHNydi5jCiAzMzY0IE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMTEgW21lcmdlXQogICAgICBNZXJn
ZSBteXNxbC01LjEtaW5ub2RiIHRvIG15c3FsLTUuNS1pbm5vZGIuCgogICAgYWRkZWQ6CiAgICAg
IG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzU5NjQxLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1OTY0MS50ZXN0CiAgICBtb2RpZmll
ZDoKICAgICAgY2xpZW50L215c3FsdGVzdC5jYwogICAgICBzcWwvc3FsX2NsYXNzLmNjCiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYV9pbm5vZGIuY2MKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9oYW5kbGVyL2hhX2lubm9kYi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9o
YW5kbGVyMGFsdGVyLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4LmgK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDB1bmRvLmgKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9sb2cvbG9nMGxvZy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDBzeXMu
YwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmMKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS90cngvdHJ4MHVuZG8uYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9z
cnYvc3J2MHNydi5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MTExNDAzMzItNzdpMGZ6eTc3MjY2b3Z0bAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwc3J2LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA0MTIwNjIyNDMtMWgwem9yaThqM215M3RwMApAQCAtMTYyNCwxNyArMTYy
NCw2IEBAIHNydl9zdXNwZW5kX215c3FsX3RocmVhZCgKIAogCW11dGV4X2V4aXQoJmtlcm5lbF9t
dXRleCk7CiAKLQlpZiAodHJ4LT5kZWNsYXJlZF90b19iZV9pbnNpZGVfaW5ub2RiKSB7Ci0KLQkJ
d2FzX2RlY2xhcmVkX2luc2lkZV9pbm5vZGIgPSBUUlVFOwotCi0JCS8qIFdlIG11c3QgZGVjbGFy
ZSB0aGlzIE9TIHRocmVhZCB0byBleGl0IElubm9EQiwgc2luY2UgYQotCQlwb3NzaWJsZSBvdGhl
ciB0aHJlYWQgaG9sZGluZyBhIGxvY2sgd2hpY2ggdGhpcyB0aHJlYWQgd2FpdHMKLQkJZm9yIG11
c3QgYmUgYWxsb3dlZCB0byBlbnRlciwgc29vbmVyIG9yIGxhdGVyICovCi0KLQkJc3J2X2NvbmNf
Zm9yY2VfZXhpdF9pbm5vZGIodHJ4KTsKLQl9Ci0KIAloYWRfZGljdF9sb2NrID0gdHJ4LT5kaWN0
X29wZXJhdGlvbl9sb2NrX21vZGU7CiAKIAlzd2l0Y2ggKGhhZF9kaWN0X2xvY2spIHsKQEAgLTE2
NjIsMTIgKzE2NTEsMzQgQEAgc3J2X3N1c3BlbmRfbXlzcWxfdGhyZWFkKAogCiAJdXRfYSh0cngt
PmRpY3Rfb3BlcmF0aW9uX2xvY2tfbW9kZSA9PSAwKTsKIAorCWlmICh0cngtPmRlY2xhcmVkX3Rv
X2JlX2luc2lkZV9pbm5vZGIpIHsKKworCQl3YXNfZGVjbGFyZWRfaW5zaWRlX2lubm9kYiA9IFRS
VUU7CisKKwkJLyogV2UgbXVzdCBkZWNsYXJlIHRoaXMgT1MgdGhyZWFkIHRvIGV4aXQgSW5ub0RC
LCBzaW5jZSBhCisJCXBvc3NpYmxlIG90aGVyIHRocmVhZCBob2xkaW5nIGEgbG9jayB3aGljaCB0
aGlzIHRocmVhZCB3YWl0cworCQlmb3IgbXVzdCBiZSBhbGxvd2VkIHRvIGVudGVyLCBzb29uZXIg
b3IgbGF0ZXIgKi8KKworCQlzcnZfY29uY19mb3JjZV9leGl0X2lubm9kYih0cngpOworCX0KKwog
CS8qIFN1c3BlbmQgdGhpcyB0aHJlYWQgYW5kIHdhaXQgZm9yIHRoZSBldmVudC4gKi8KIAogCXRo
ZF93YWl0X2JlZ2luKHRyeC0+bXlzcWxfdGhkLCBUSERfV0FJVF9ST1dfVEFCTEVfTE9DSyk7CiAJ
b3NfZXZlbnRfd2FpdChldmVudCk7CiAJdGhkX3dhaXRfZW5kKHRyeC0+bXlzcWxfdGhkKTsKIAor
I2lmZGVmIFVOSVZfU1lOQ19ERUJVRworCXV0X2FkKCFzeW5jX3RocmVhZF9sZXZlbHNfbm9uZW1w
dHlfdHJ4KHRyeC0+aGFzX3NlYXJjaF9sYXRjaCkpOworI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJV
RyAqLworCisJaWYgKHdhc19kZWNsYXJlZF9pbnNpZGVfaW5ub2RiKSB7CisKKwkJLyogUmV0dXJu
IGJhY2sgaW5zaWRlIElubm9EQiAqLworCisJCXNydl9jb25jX2ZvcmNlX2VudGVyX2lubm9kYih0
cngpOworCX0KKwogCS8qIEFmdGVyIHJlc3VtaW5nLCByZWFjcXVpcmUgdGhlIGRhdGEgZGljdGlv
bmFyeSBsYXRjaCBpZgogCW5lY2Vzc2FyeS4gKi8KIApAQCAtMTY4MywxMyArMTY5NCw2IEBAIHNy
dl9zdXNwZW5kX215c3FsX3RocmVhZCgKIAkJYnJlYWs7CiAJfQogCi0JaWYgKHdhc19kZWNsYXJl
ZF9pbnNpZGVfaW5ub2RiKSB7Ci0KLQkJLyogUmV0dXJuIGJhY2sgaW5zaWRlIElubm9EQiAqLwot
Ci0JCXNydl9jb25jX2ZvcmNlX2VudGVyX2lubm9kYih0cngpOwotCX0KLQogCW11dGV4X2VudGVy
KCZrZXJuZWxfbXV0ZXgpOwogCiAJLyogUmVsZWFzZSB0aGUgc2xvdCBmb3Igb3RoZXJzIHRvIHVz
ZSAqLwpAQCAtMTc0NCwxMCArMTc0OCw2IEBAIHNydl9zdXNwZW5kX215c3FsX3RocmVhZCgKIAog
CQl0cngtPmVycm9yX3N0YXRlID0gREJfSU5URVJSVVBURUQ7CiAJfQotCi0jaWZkZWYgVU5JVl9T
WU5DX0RFQlVHCi0JdXRfYWQoIXN5bmNfdGhyZWFkX2xldmVsc19ub25lbXB0eV90cngodHJ4LT5o
YXNfc2VhcmNoX2xhdGNoKSk7Ci0jZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiB9CiAKIC8q
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8vKioKCg==

--===============1465563252==
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: b4dfa7fe5e4c67c33bce262eca21c043f352189e
# timestamp: 2011-04-12 11:11:27 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   77i0fzy77266ovtl
# 
# Begin bundle
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
KEhXzaJngA==


--===============1465563252==--