From: marko.makela
Date: November 22 2011 11:24am
Subject: bzr push into mysql-5.5 branch (marko.makela:3623 to 3624) Bug#13340047
List-Archive: http://lists.mysql.com/commits/142132
X-Bug: 13340047
Message-Id: <201111221124.pAMBOrZ6029612@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MjQgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0yMgogICAgICBCdWcjMTMzNDAwNDcgTEFUQ0hJ
TkcgT1JERVIgVklPTEFUSU9OIElOIElCVUZfU0VUX0VOVFJZX0NPVU5URVIoKSAtIGNsZWFudXAK
ICAgICAgCiAgICAgIFJlbW92ZSBidHJfY3VyX3Q6OmlidWZfY250LiBUaGUgb25seSBkZXBlbmRl
bmNlIG9uIGN1cnNvci0+aWJ1Zl9jbnQKICAgICAgd2FzIGlidWZfc2V0X2VudHJ5X2NvdW50ZXIo
KS4gVGhhdCBjb2RlIHBhdGggd2FzIHJlbW92ZWQgaW4gdGhlCiAgICAgIG9yaWdpbmFsIGJ1ZyBm
aXggKG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA3MDcyODAyLWRnd2FnZWpscHViMHJq
a2QpLgogICAgICAKICAgICAgcmI6ODE5IGFwcHJvdmVkIGJ5IEppbW15IFlhbmcKCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9idHIwY3VyLmgKIDM2MjMgU25laGEgTW9kaQkyMDExLTExLTIxCiAg
ICAgIEJ1ZyMxMTc0ODczMTpTT01FICdCSUcnIFRFU1RTIEZBSUxJTkcgT04gNi4wIAogICAgICAK
ICAgICAgQSBwYXRjaCBmb3IgYWx0ZXJfdGFibGUtYmlnLnRlc3QgaGFzIGJlZW4gY29tbWl0dGVk
IGVhcmxpZXIuCiAgICAgIFRoaXMgaXMgYSBwYXRjaCBmb3IgY3JlYXRlLWJpZy50ZXN0OgogICAg
ICBUaGUgdGVzdCB1c2VkIHRvIHRpbWUtb3V0IGFmdGVyIDkwMCBzZWNvbmRzLiAKICAgICAgSXQg
cmVsaWVkIG9uIGRlYnVnIHNsZWVwcyB0aGF0IGFyZSBubyBsb25nZXIgcHJlc2VudCBpbiB0aGUg
CiAgICAgIGNvZGUuIFNpbmNlIHRoZSBzbGVlcHMgYXJlIGxvbmcgZ29uZSwgZml4aW5nIHRoZSBw
cm9ibGVtIGRpZG4ndCAKICAgICAgaW52b2x2ZSBqdXN0IHVwZGF0aW5nIHRoZSByZXN1bHQgZmls
ZSBvciB1c2luZyBtYWNybyAKICAgICAgInNob3dfYmlubG9nX2V2ZW50czIuaW5jIiBpbnN0ZWFk
IG9mICJzaG93IGJpbmxvZyBldmVudHMiIAogICAgICBzdGF0ZW1lbnQuIFRoZSB0ZXN0IG5lZWRl
ZCB0byBiZSByZXdyaXR0ZW4gdXNpbmcgZGVidWcgc3luYyAKICAgICAgcG9pbnRzLCBhbmQgcmVz
dWx0IHRoZW4gbmVlZGVkIHRvIGJlIHVwZGF0ZWQuCiAgICAgIFNvLCB0aGUgc2xlZXBzIGhhdmUg
YmVlbiByZXBsYWNlZCBieSBkZWJ1Z19zeW5jIHBvaW50cyBhbmQgdGhlIHRlc3QgZXhlY3V0aW9u
IHRpbWUgaGFzIAogICAgICBiZWVuIHJlZHVjZWQgc2lnbmlmaWNhbnRseS4KCiAgICBtb2RpZmll
ZDoKICAgICAgbXlzcWwtdGVzdC9yL2NyZWF0ZS1iaWcucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
dC9jcmVhdGUtYmlnLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L2Rpc2FibGVkLmRlZgogICAgICBz
cWwvc3FsX2luc2VydC5jYwogICAgICBzcWwvc3FsX3RhYmxlLmNjCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBjdXIuYwlyZXZpZDpzbmVoYS5tb2RpQG9yYWNsZS5jb20tMjAxMTExMjExMTM3MDgt
dm9kZGJlOWsxcml3ZHkzYQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMjIxMTE0NTUtYW5kbHVxd3hpMWM4bDZ6
YgpAQCAtNDU4LDggKzQ1OCw2IEBAIGJ0cl9jdXJfc2VhcmNoX3RvX250aF9sZXZlbCgKIAljdXJz
b3ItPmZsYWcgPSBCVFJfQ1VSX0JJTkFSWTsKIAljdXJzb3ItPmluZGV4ID0gaW5kZXg7CiAKLQlj
dXJzb3ItPmlidWZfY250ID0gVUxJTlRfVU5ERUZJTkVEOwotCiAjaWZuZGVmIEJUUl9DVVJfQURB
UFQKIAlndWVzcyA9IE5VTEw7CiAjZWxzZQpAQCAtNzQ3LDIxICs3NDUsOCBAQCByZXRyeV9wYWdl
X2dldDoKIAkJCS8qIFdlJ3JlIGRvaW5nIGEgc2VhcmNoIG9uIGFuIGlidWYgdHJlZSBhbmQgd2Un
cmUgb25lCiAJCQlsZXZlbCBhYm92ZSB0aGUgbGVhZiBwYWdlLiAqLwogCi0JCQl1bGludAlpc19t
aW5fcmVjOwotCiAJCQl1dF9hZChsZXZlbCA9PSAwKTsKIAotCQkJaXNfbWluX3JlYyA9IHJlY19n
ZXRfaW5mb19iaXRzKG5vZGVfcHRyLCAwKQotCQkJCSYgUkVDX0lORk9fTUlOX1JFQ19GTEFHOwot
Ci0JCQlpZiAoIWlzX21pbl9yZWMpIHsKLQkJCQljdXJzb3ItPmlidWZfY250Ci0JCQkJCT0gaWJ1
Zl9yZWNfZ2V0X2NvdW50ZXIobm9kZV9wdHIpOwotCi0JCQkJdXRfYShjdXJzb3ItPmlidWZfY250
IDw9IDB4RkZGRgotCQkJCSAgICAgfHwgY3Vyc29yLT5pYnVmX2NudCA9PSBVTElOVF9VTkRFRklO
RUQpOwotCQkJfQotCiAJCQlidWZfbW9kZSA9IEJVRl9HRVQ7CiAJCQlyd19sYXRjaCA9IFJXX05P
X0xBVENIOwogCQkJZ290byByZXRyeV9wYWdlX2dldDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvYnRyMGN1ci5oCXJldmlkOnNuZWhhLm1vZGlAb3JhY2xlLmNvbS0yMDExMTEyMTExMzcw
OC12b2RkYmU5azFyaXdkeTNhCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwY3Vy
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMjIxMTE0NTUtYW5kbHVxd3hp
MWM4bDZ6YgpAQCAtNzQzLDI0ICs3NDMsNiBAQCBzdHJ1Y3QgYnRyX2N1cl9zdHJ1Y3QgewogCQkJ
CQlOVUxMICovCiAJdWxpbnQJCWZvbGQ7CQkvKiE8IGZvbGQgdmFsdWUgdXNlZCBpbiB0aGUgc2Vh
cmNoIGlmCiAJCQkJCWZsYWcgaXMgQlRSX0NVUl9IQVNIICovCi0JLyotLS0tLSBEZWxldGUgYnVm
ZmVyaW5nIC0tLS0tLS0qLwotCXVsaW50CQlpYnVmX2NudDsJLyogaW4gc2VhcmNoZXMgZG9uZSBv
biBpbnNlcnQgYnVmZmVyCi0JCQkJCXRyZWVzLCB0aGlzIGNvbnRhaW5zIHRoZSAiY291bnRlciIK
LQkJCQkJdmFsdWUgKHRoZSBmaXJzdCB0d28gYnl0ZXMgb2YgdGhlCi0JCQkJCWZvdXJ0aCBmaWVs
ZCkgZXh0cmFjdGVkIGZyb20gdGhlCi0JCQkJCXBhZ2UgYWJvdmUgdGhlIGxlYWYgcGFnZSwgZnJv
bSB0aGUKLQkJCQkJZmF0aGVyIG5vZGUgcG9pbnRlciB0aGF0IHBvaW50ZWQgdG8KLQkJCQkJdGhl
IGxlYWYgcGFnZS4gaW4gb3RoZXIgd29yZHMsIGl0Ci0JCQkJCWNvbnRhaW5zIHRoZSBtaW5pbXVt
IGNvdW50ZXIgdmFsdWUKLQkJCQkJZm9yIHJlY29yZHMgdG8gYmUgaW5zZXJ0ZWQgb24gdGhlCi0J
CQkJCWNob3NlbiBsZWFmIHBhZ2UuIElmIGZvciBzb21lIHJlYXNvbgotCQkJCQl0aGlzIGNhbid0
IGJlIHJlYWQsIG9yIGlmIHRoZSBzZWFyY2gKLQkJCQkJZW5kZWQgb24gdGhlIGxlZnRtb3N0IGxl
YWYgcGFnZSBpbgotCQkJCQl0aGUgdHJlZSAoaW4gd2hpY2ggY2FzZSB0aGUgZmF0aGVyCi0JCQkJ
CW5vZGUgcG9pbnRlciBoYWQgdGhlICdtaW5pbXVtCi0JCQkJCXJlY29yZCcgZmxhZyBzZXQpLCB0
aGlzIGlzCi0JCQkJCVVMSU5UX1VOREVGSU5FRC4gKi8KLQkvKi0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLSovCiAJLyogQH0gKi8KIAlidHJfcGF0aF90KglwYXRoX2FycjsJLyohPCBpbiBl
c3RpbWF0aW5nIHRoZSBudW1iZXIgb2YKIAkJCQkJcm93cyBpbiByYW5nZSwgd2Ugc3RvcmUgaW4g
dGhpcyBhcnJheQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=