From: marko.makela
Date: November 22 2011 11:24am
Subject: bzr push into mysql-trunk branch (marko.makela:3641 to 3642)
List-Archive: http://lists.mysql.com/commits/142131
Message-Id: <201111221124.pAMBOJTE029227@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2NDIgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0yMiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9idHIvYnRyMGN1ci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5o
CiAzNjQxIFNuZWhhIE1vZGkJMjAxMS0xMS0yMiBbbWVyZ2VdCiAgICAgIE51bGwgbWVyZ2Ugb2Yg
Zml4IGZvciBCdWcjMTE3NDg3MzEgZnJvbSBteXNxbC01LjUgLT4gbXlzcWwtdHJ1bmsKCj09PSBt
b2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCXJldmlkOnNuZWhhLm1vZGlAb3JhY2xlLmNvbS0y
MDExMTEyMjEwNTcxMS11bTh3OTZubWxlNHFxd3g1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRy
L2J0cjBjdXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMjIxMTIxNDUt
dHo0dnEwZ2UzMzN0aDRiZwpAQCAtNDYzLDggKzQ2Myw2IEBAIGJ0cl9jdXJfc2VhcmNoX3RvX250
aF9sZXZlbCgKIAljdXJzb3ItPmZsYWcgPSBCVFJfQ1VSX0JJTkFSWTsKIAljdXJzb3ItPmluZGV4
ID0gaW5kZXg7CiAKLQljdXJzb3ItPmlidWZfY250ID0gVUxJTlRfVU5ERUZJTkVEOwotCiAjaWZu
ZGVmIEJUUl9DVVJfQURBUFQKIAlndWVzcyA9IE5VTEw7CiAjZWxzZQpAQCAtNzUyLDIxICs3NTAs
OCBAQCByZXRyeV9wYWdlX2dldDoKIAkJCS8qIFdlJ3JlIGRvaW5nIGEgc2VhcmNoIG9uIGFuIGli
dWYgdHJlZSBhbmQgd2UncmUgb25lCiAJCQlsZXZlbCBhYm92ZSB0aGUgbGVhZiBwYWdlLiAqLwog
Ci0JCQl1bGludAlpc19taW5fcmVjOwotCiAJCQl1dF9hZChsZXZlbCA9PSAwKTsKIAotCQkJaXNf
bWluX3JlYyA9IHJlY19nZXRfaW5mb19iaXRzKG5vZGVfcHRyLCAwKQotCQkJCSYgUkVDX0lORk9f
TUlOX1JFQ19GTEFHOwotCi0JCQlpZiAoIWlzX21pbl9yZWMpIHsKLQkJCQljdXJzb3ItPmlidWZf
Y250Ci0JCQkJCT0gaWJ1Zl9yZWNfZ2V0X2NvdW50ZXIobm9kZV9wdHIpOwotCi0JCQkJdXRfYShj
dXJzb3ItPmlidWZfY250IDw9IDB4RkZGRgotCQkJCSAgICAgfHwgY3Vyc29yLT5pYnVmX2NudCA9
PSBVTElOVF9VTkRFRklORUQpOwotCQkJfQotCiAJCQlidWZfbW9kZSA9IEJVRl9HRVQ7CiAJCQly
d19sYXRjaCA9IFJXX05PX0xBVENIOwogCQkJZ290byByZXRyeV9wYWdlX2dldDsKCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5oJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5oCXJldmlkOnNuZWhhLm1vZGlAb3JhY2xlLmNv
bS0yMDExMTEyMjEwNTcxMS11bTh3OTZubWxlNHFxd3g1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idHIwY3VyLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMjIx
MTIxNDUtdHo0dnEwZ2UzMzN0aDRiZwpAQCAtNzc0LDI0ICs3NzQsNiBAQCBzdHJ1Y3QgYnRyX2N1
cl9zdHJ1Y3QgewogCQkJCQlOVUxMICovCiAJdWxpbnQJCWZvbGQ7CQkvKiE8IGZvbGQgdmFsdWUg
dXNlZCBpbiB0aGUgc2VhcmNoIGlmCiAJCQkJCWZsYWcgaXMgQlRSX0NVUl9IQVNIICovCi0JLyot
LS0tLSBEZWxldGUgYnVmZmVyaW5nIC0tLS0tLS0qLwotCXVsaW50CQlpYnVmX2NudDsJLyogaW4g
c2VhcmNoZXMgZG9uZSBvbiBpbnNlcnQgYnVmZmVyCi0JCQkJCXRyZWVzLCB0aGlzIGNvbnRhaW5z
IHRoZSAiY291bnRlciIKLQkJCQkJdmFsdWUgKHRoZSBmaXJzdCB0d28gYnl0ZXMgb2YgdGhlCi0J
CQkJCWZvdXJ0aCBmaWVsZCkgZXh0cmFjdGVkIGZyb20gdGhlCi0JCQkJCXBhZ2UgYWJvdmUgdGhl
IGxlYWYgcGFnZSwgZnJvbSB0aGUKLQkJCQkJZmF0aGVyIG5vZGUgcG9pbnRlciB0aGF0IHBvaW50
ZWQgdG8KLQkJCQkJdGhlIGxlYWYgcGFnZS4gaW4gb3RoZXIgd29yZHMsIGl0Ci0JCQkJCWNvbnRh
aW5zIHRoZSBtaW5pbXVtIGNvdW50ZXIgdmFsdWUKLQkJCQkJZm9yIHJlY29yZHMgdG8gYmUgaW5z
ZXJ0ZWQgb24gdGhlCi0JCQkJCWNob3NlbiBsZWFmIHBhZ2UuIElmIGZvciBzb21lIHJlYXNvbgot
CQkJCQl0aGlzIGNhbid0IGJlIHJlYWQsIG9yIGlmIHRoZSBzZWFyY2gKLQkJCQkJZW5kZWQgb24g
dGhlIGxlZnRtb3N0IGxlYWYgcGFnZSBpbgotCQkJCQl0aGUgdHJlZSAoaW4gd2hpY2ggY2FzZSB0
aGUgZmF0aGVyCi0JCQkJCW5vZGUgcG9pbnRlciBoYWQgdGhlICdtaW5pbXVtCi0JCQkJCXJlY29y
ZCcgZmxhZyBzZXQpLCB0aGlzIGlzCi0JCQkJCVVMSU5UX1VOREVGSU5FRC4gKi8KLQkvKi0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSovCiAJLyogQH0gKi8KIAlidHJfcGF0aF90KglwYXRo
X2FycjsJLyohPCBpbiBlc3RpbWF0aW5nIHRoZSBudW1iZXIgb2YKIAkJCQkJcm93cyBpbiByYW5n
ZSwgd2Ugc3RvcmUgaW4gdGhpcyBhcnJheQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9y
IHB1c2ggZW1haWxzKS4=