From: marko.makela
Date: January 20 2011 2:15pm
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3445 to 3446) WL#5458
List-Archive: http://lists.mysql.com/commits/129284
Message-Id: <201101201415.p0KEAhQU027364@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1476413382=="

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

IDM0NDYgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yMAogICAgICBBZGQgc29tZSBkZWJ1ZyBhc3Nl
cnRpb25zIGFuZCBjb3JyZWN0IHNvbWUgY29tbWVudHMuCiAgICAgIFRoaXMgaXMgcGFydCBvZiB0
aGUgV0wjNTQ1OCBjbGVhbi11cC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL2xvY2swbG9jay5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxv
Y2suYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmMKIDM0NDUgTWFya28gTcOk
a2Vsw6QJMjAxMS0wMS0yMAogICAgICBDbGFyaWZ5IHRoZSBwcm90ZWN0aW9uIHJ1bGVzIG9mIHRy
eF9sb2NrX3Q6OndhaXRfdGhyLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvdHJ4MHRyeC5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvbG9jazBsb2NrLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxv
Y2suaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NTA0OS00eHZqaXZx
Y2xkZ2hpNzdiCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2NrMGxvY2suaAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDE0MTUyNC1teW5weGcwdzBjZDlvaWhn
CkBAIC02MTAsNyArNjEwLDcgQEAgbG9ja19wcmludF9pbmZvX3N1bW1hcnkoCiAvKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqLy8qKgogUHJpbnRzIGluZm8gb2YgbG9ja3MgZm9yIGVhY2ggdHJhbnNhY3Rpb24uIFRoaXMg
ZnVuY3Rpb24gYXNzdW1lcyB0aGF0IHRoZQogY2FsbGVyIGhvbGRzIHRoZSBsb2NrIG11dGV4IGFu
ZCBtb3JlIGltcG9ydGFudGx5IGl0IHdpbGwgcmVsZWFzZSB0aGUgbG9jawotbG9jayBtdXRleCBv
biBiZWhhbGYgb2YgdGhlIGNhbGxlci4gKFRoaXMgc2hvdWxkIGJlIGZpeGVkIGluIHRoZSBmdXR1
cmUpLiAqLworbXV0ZXggb24gYmVoYWxmIG9mIHRoZSBjYWxsZXIuIChUaGlzIHNob3VsZCBiZSBm
aXhlZCBpbiB0aGUgZnV0dXJlKS4gKi8KIFVOSVZfSU5URVJOCiB2b2lkCiBsb2NrX3ByaW50X2lu
Zm9fYWxsX3RyYW5zYWN0aW9ucygKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L2xvY2svbG9jazBsb2NrLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2su
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NTA0OS00eHZqaXZxY2xk
Z2hpNzdiCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvbG9jay9sb2NrMGxvY2suYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDE0MTUyNC1teW5weGcwdzBjZDlvaWhnCkBAIC04
NDIsNiArODQyLDcgQEAgbG9ja19yZXNldF9sb2NrX2FuZF90cnhfd2FpdCgKIHsKIAl1dF9hZChs
b2NrLT50cngtPmxvY2sud2FpdF9sb2NrID09IGxvY2spOwogCXV0X2FkKGxvY2tfZ2V0X3dhaXQo
bG9jaykpOworCXV0X2FkKGxvY2tfbXV0ZXhfb3duKCkpOwogCiAJLyogUmVzZXQgdGhlIGJhY2sg
cG9pbnRlciBpbiB0cnggdG8gdGhpcyB3YWl0aW5nIGxvY2sgcmVxdWVzdCAqLwogCkBAIC0yMzg1
LDYgKzIzODYsNyBAQCBsb2NrX3JlY19kZXF1ZXVlX2Zyb21fcGFnZSgKIAkJICAgICYmICFsb2Nr
X3JlY19oYXNfdG9fd2FpdF9pbl9xdWV1ZShsb2NrKSkgewogCiAJCQkvKiBHcmFudCB0aGUgbG9j
ayAqLworCQkJdXRfYWQobG9jay0+dHJ4ICE9IGluX2xvY2stPnRyeCk7CiAJCQlsb2NrX2dyYW50
KGxvY2spOwogCQl9CiAJfQpAQCAtMzM4OSw2ICszMzkxLDggQEAgdm9pZAogbG9ja19kZWFkbG9j
a19zdGFydF9wcmludCgpCiAvKj09PT09PT09PT09PT09PT09PT09PT09Ki8KIHsKKwl1dF9hZChs
b2NrX211dGV4X293bigpKTsKKwogCXJld2luZChsb2NrX2xhdGVzdF9lcnJfZmlsZSk7CiAJdXRf
cHJpbnRfdGltZXN0YW1wKGxvY2tfbGF0ZXN0X2Vycl9maWxlKTsKIApAQCAtNDE0OCw2ICs0MTUy
LDcgQEAgbG9ja190YWJsZV9kZXF1ZXVlKAogCQkgICAgJiYgIWxvY2tfdGFibGVfaGFzX3RvX3dh
aXRfaW5fcXVldWUobG9jaykpIHsKIAogCQkJLyogR3JhbnQgdGhlIGxvY2sgKi8KKwkJCXV0X2Fk
KGluX2xvY2stPnRyeCAhPSBsb2NrLT50cngpOwogCQkJbG9ja19ncmFudChsb2NrKTsKIAkJfQog
CX0KQEAgLTQyMjEsMTMgKzQyMjYsMTMgQEAgcmVsZWFzZWQ6CiAJCSAgICAmJiAhbG9ja19yZWNf
aGFzX3RvX3dhaXRfaW5fcXVldWUobG9jaykpIHsKIAogCQkJLyogR3JhbnQgdGhlIGxvY2sgKi8K
KwkJCXV0X2FkKHRyeCAhPSBsb2NrLT50cngpOwogCQkJbG9ja19ncmFudChsb2NrKTsKIAkJfQog
CX0KIAotCXRyeF9tdXRleF9leGl0KHRyeCk7Ci0KIAlsb2NrX211dGV4X2V4aXQoKTsKKwl0cnhf
bXV0ZXhfZXhpdCh0cngpOwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgpAQCAtNDcxMyw4ICs0NzE4
LDggQEAgbG9ja19wcmludF9pbmZvX3N1bW1hcnkoCiAKIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBQcmlu
dHMgaW5mbyBvZiBsb2NrcyBmb3IgZWFjaCB0cmFuc2FjdGlvbi4gVGhpcyBmdW5jdGlvbiBhc3N1
bWVzIHRoYXQgdGhlCi1jYWxsZXIgaG9sZHMgdGhlIGxvY2sgbXV0ZXggYW5kIG1vcmUgaW1wb3J0
YW50bHkgaXQgd2lsbCByZWVhc2UgdGhlIGxvY2sKLWxvY2sgbXV0ZXggb24gYmVoYWxmIG9mIHRo
ZSBjYWxsZXIuIChUaGlzIHNob3VsZCBiZSBmaXhlZCBpbiB0aGUgZnV0dXJlKS4gKi8KK2NhbGxl
ciBob2xkcyB0aGUgbG9jayBtdXRleCBhbmQgbW9yZSBpbXBvcnRhbnRseSBpdCB3aWxsIHJlbGVh
c2UgdGhlIGxvY2sKK211dGV4IG9uIGJlaGFsZiBvZiB0aGUgY2FsbGVyLiAoVGhpcyBzaG91bGQg
YmUgZml4ZWQgaW4gdGhlIGZ1dHVyZSkuICovCiBVTklWX0lOVEVSTgogdm9pZAogbG9ja19wcmlu
dF9pbmZvX2FsbF90cmFuc2FjdGlvbnMoCkBAIC02MTkxLDYgKzYxOTYsNyBAQCBsb2NrX3VubG9j
a190YWJsZV9hdXRvaW5jKAogLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KIAl0cnhfdCoJdHJ4
KQkvKiE8IGluL291dDogdHJhbnNhY3Rpb24gKi8KIHsKKwl1dF9hZCghbG9ja19tdXRleF9vd24o
KSk7CiAJLyogVGhpcyBmdW5jdGlvbiBpcyBpbnZva2VkIGZvciBhIHJ1bm5pbmcgdHJhbnNhY3Rp
b24gYnkgdGhlCiAJdGhyZWFkIHRoYXQgaXMgc2VydmluZyB0aGUgdHJhbnNhY3Rpb24uIFRoZXJl
Zm9yZSBpdCBpcyBub3QKIAluZWNlc3NhcnkgdG8gaG9sZCB0cngtPm11dGV4IGhlcmUuICovCkBA
IC02MzMwLDYgKzYzMzYsNyBAQCBsb2NrX3RhYmxlX2xvY2tzX2NoZWNrKAogCiAJdXRfYSh0YWJs
ZSAhPSBOVUxMKTsKIAl1dF9hZChsb2NrX211dGV4X293bigpKTsKKwl1dF9hZCghdHJ4X211dGV4
X293bih0cngpKTsKIAogCXJ3X2xvY2tfc19sb2NrKCZ0cnhfc3lzLT5sb2NrKTsKIAoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwMTIwMDk1MDQ5LTR4dmppdnFjbGRnaGk3N2IKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS90cngv
dHJ4MHRyeC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTIwMTQxNTI0LW15
bnB4ZzB3MGNkOW9paGcKQEAgLTg4Myw2ICs4ODMsOCBAQCB0cnhfY2xlYW51cF9hdF9kYl9zdGFy
dHVwKAogLyo9PT09PT09PT09PT09PT09PT09PT09Ki8KIAl0cnhfdCoJdHJ4KQkvKiE8IGluOiB0
cmFuc2FjdGlvbiAqLwogeworCXV0X2FkKHRyeC0+aXNfcmVjb3ZlcmVkKTsKKwogCWlmICh0cngt
Pmluc2VydF91bmRvICE9IE5VTEwpIHsKIAogCQl0cnhfdW5kb19pbnNlcnRfY2xlYW51cCh0cngp
OwoK

--===============1476413382==
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.6-innodb/
# testament_sha1: 0c5033589220fc7ce5e029ff72063ff2738ab4d4
# timestamp: 2011-01-20 16:15:48 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   4xvjivqcldghi77b
# 
# Begin bundle
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
ChIBf8C1YA==


--===============1476413382==--