From: marko.makela
Date: October 4 2011 7:08am
Subject: bzr push into mysql-trunk branch (marko.makela:3472 to 3473) Bug#13056253
List-Archive: http://lists.mysql.com/commits/141294
X-Bug: 13056253
Message-Id: <201110040708.p9478XRv032749@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NzMgTWFya28gTcOka2Vsw6QJMjAxMS0xMC0wNAogICAgICBCdWcjMTMwNTYyNTMgUEVSU0lT
VEVOVCBTVEFUUywgQVNTRVJUIElOIEFOQUxZWkUsIEhFQVAgPT0gTlVMTCwKICAgICAgRElDVF9T
VEFUU19TQ0FOX1BBR0UoKQogICAgICAKICAgICAgU29ycnksIG15IGJhZC4gVGhpcyB3YXMgYW4g
b2ZmLWJ5LW9uZSBlcnJvciBpbiBteSBmaXggb2YKICAgICAgQnVnICMxMzAzNDk2MiBDUkFTSEVT
IElOIEFOQUxZWkUsIFBFUlNJU1RFTlQgU1RBVFMsIE9GRlNFVCA2NTUzNQogICAgICAoYnpyIHJl
dmlzaW9uIGlkIG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwOTI5MTMyMzAxLTFhOHRpZ29q
bTJqZm14ZWspCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0
MHN0YXRzLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yZW0vcmVtMHJlYy5jCiAzNDcyIEluYWFt
IFJhbmEJMjAxMS0xMC0wMwogICAgICBCdWcjMTE3NTkwNDQgLSA1MTMyNTogRFJPUFBJTkcgQU4g
RU1QVFkgSU5OT0RCIFRBQkxFIFRBS0VTIEEgTE9ORyBUSU1FCiAgICAgIFdJVEggTEFSR0UgQlVG
RkVSIFBPT0wKICAgICAgCiAgICAgIHJiOi8vNzY3CiAgICAgIGFwcHJvdmVkIGJ5OiBNYXJrbwog
ICAgICAKICAgICAgV2hlbiBkcm9wcGluZyBhIHRhYmxlICh3aXRoIGFuIC5pYmQgZmlsZSBpLmUu
OiB3aXRoCiAgICAgIGlubm9kYl9maWxlX3Blcl90YWJsZSBzZXQpIHdlIHNjYW4gZW50aXJlIExS
VSB0byBpbnZhbGlkYXRlIHBhZ2VzIGZyb20KICAgICAgdGhhdCB0YWJsZS4gVGhpcyBjYW4gYmUg
cGFpbmZ1bCBpbiBjYXNlIG9mIGxhcmdlIGJ1ZmZlciBwb29scyBhcyB3ZSBob2xkCiAgICAgIHRo
ZSBidWZfcG9vbC0+bXV0ZXggZm9yIHRoZSBzY2FuLiBOb3RlIHRoYXQgZ3Jhdml0eSBvZiB0aGUg
cHJvYmxlbSBkb2VzCiAgICAgIG5vdCBkZXBlbmQgb24gdGhlIHNpemUgb2YgdGhlIHRhYmxlLiBF
dmVuIHdpdGggYW4gZW1wdHkgdGFibGUgYnV0IGEKICAgICAgbGFyZ2UgYW5kIGZpbGxlZCB1cCBi
dWZmZXIgcG9vbCB3ZSdsbCBlbmQgdXAgc2Nhbm5pbmcgYSB2ZXJ5IGxvbmcgTFJVCiAgICAgIGxp
c3QuCiAgICAgIAogICAgICBUaGUgZml4IGlzIHRvIHNjYW4gZmx1c2hfbGlzdCBhbmQganVzdCBy
ZW1vdmUgdGhlIGJsb2NrcyBiZWxvbmdpbmcgdG8KICAgICAgdGhlIHRhYmxlIGZyb20gdGhlIGZs
dXNoX2xpc3QsIG1hcmtpbmcgdGhlbSBhcyBub24tZGlydHkuIFRoZSBibG9ja3MKICAgICAgYXJl
IGxlZnQgaW4gdGhlIExSVSBsaXN0IGZvciBldmVudHVhbCBldmljdGlvbiBkdWUgdG8gYWdpbmcu
IFRoZQogICAgICBmbHVzaF9saXN0IGlzIHR5cGljYWxseSBtdWNoIHNtYWxsZXIgdGhhbiB0aGUg
TFJVIGxpc3QgYnV0IGZvciBjYXNlcwogICAgICB3aGVyZSBpdCBpcyB2ZXJ5IGxvbmcgd2UgaGF2
ZSB0aGUgc29sdXRpb24gb2YgcmVsZWFzaW5nIHRoZQogICAgICBidWZfcG9vbC0+bXV0ZXggYWZ0
ZXIgc2Nhbm5pbmcgMUsgcGFnZXMuCiAgICAgIAogICAgICBidWZfcGFnZV9bc2V0fHVuc2V0XV9z
dGlja3koKTogVXNlIG5ldyBJTy1zdGF0ZSBCVUZfSU9fUElOIHRvIGVuc3VyZQogICAgICB0aGF0
IGEgYmxvY2sgc3RheXMgaW4gdGhlIGZsdXNoX2xpc3QgYW5kIExSVSBsaXN0IHdoZW4gd2UgcmVs
ZWFzZQogICAgICBidWZfcG9vbC0+bXV0ZXguIFByZXZpb3VzbHkgd2UgaGF2ZSBiZWVuIGFidXNp
bmcgQlVGX0lPX1JFQUQgdG8gYWNoaWV2ZQogICAgICB0aGlzLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9i
dWYvYnVmMGxydS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9pX3MuY2MKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J1ZjBidWYuaAogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvYnVmMGJ1Zi5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnVmMHR5
cGVzLmgKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MHN0YXRz
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MHN0YXRzLmMJcmV2aWQ6aW5hYW0u
cmFuYUBvcmFjbGUuY29tLTIwMTExMDAzMTc1MzU0LTR3dzVpdGlldjFzZnE3bWQKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qwc3RhdHMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDExMTAwNDA3MDYzNC02a2FqcGxkbWMxdDU0MTRkCkBAIC03OTEsOCArNzkxLDEyIEBA
IGRpY3Rfc3RhdHNfYW5hbHl6ZV9pbmRleF9iZWxvd19jdXIoCiAJLyogQWxsb2NhdGUgb2Zmc2V0
cyBmb3IgdGhlIHJlY29yZCBhbmQgdGhlIG5vZGUgcG9pbnRlciwgZm9yCiAJbm9kZSBwb2ludGVy
IHJlY29yZHMuIEluIGEgc2Vjb25kYXJ5IGluZGV4LCB0aGUgbm9kZSBwb2ludGVyCiAJcmVjb3Jk
IHdpbGwgY29uc2lzdCBvZiBhbGwgaW5kZXggZmllbGRzIGZvbGxvd2VkIGJ5IGEgY2hpbGQKLQlw
YWdlIG51bWJlci4gKi8KLQlzaXplID0gUkVDX09GRlNfSEVBREVSX1NJWkUgKyAxICsgZGljdF9p
bmRleF9nZXRfbl9maWVsZHMoaW5kZXgpOworCXBhZ2UgbnVtYmVyLgorCUFsbG9jYXRlIHNwYWNl
IGZvciB0aGUgb2Zmc2V0cyBoZWFkZXIgKHRoZSBhbGxvY2F0aW9uIHNpemUgYXQKKwlvZmZzZXRz
WzBdIGFuZCB0aGUgUkVDX09GRlNfSEVBREVSX1NJWkUgYnl0ZXMpLCBhbmQgbl9maWVsZHMgKyAx
LAorCXNvIHRoYXQgdGhpcyB3aWxsIG5ldmVyIGJlIGxlc3MgdGhhbiB0aGUgc2l6ZSBjYWxjdWxh
dGVkIGluCisJcmVjX2dldF9vZmZzZXRzX2Z1bmMoKS4gKi8KKwlzaXplID0gKDEgKyBSRUNfT0ZG
U19IRUFERVJfU0laRSkgKyAxICsgZGljdF9pbmRleF9nZXRfbl9maWVsZHMoaW5kZXgpOwogCiAJ
aGVhcCA9IG1lbV9oZWFwX2NyZWF0ZShzaXplICogKHNpemVvZiAqb2Zmc2V0czEgKyBzaXplb2Yg
Km9mZnNldHMyKSk7CiAJb2Zmc2V0czEgPSBtZW1faGVhcF9hbGxvYyhoZWFwLCBzaXplICogc2l6
ZW9mICpvZmZzZXRzMSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yZW0v
cmVtMHJlYy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0wcmVjLmMJcmV2aWQ6aW5h
YW0ucmFuYUBvcmFjbGUuY29tLTIwMTExMDAzMTc1MzU0LTR3dzVpdGlldjFzZnE3bWQKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9yZW0vcmVtMHJlYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTExMDA0MDcwNjM0LTZrYWpwbGRtYzF0NTQxNGQKQEAgLTU1MCw2ICs1NTAsOSBAQCBy
ZWNfZ2V0X29mZnNldHNfZnVuYygKIAkJCW4gPSBkaWN0X2luZGV4X2dldF9uX2ZpZWxkcyhpbmRl
eCk7CiAJCQlicmVhazsKIAkJY2FzZSBSRUNfU1RBVFVTX05PREVfUFRSOgorCQkJLyogTm9kZSBw
b2ludGVyIHJlY29yZHMgY29uc2lzdCBvZiB0aGUKKwkJCXVuaXF1ZWx5IGlkZW50aWZ5aW5nIGZp
ZWxkcyBvZiB0aGUgcmVjb3JkCisJCQlmb2xsb3dlZCBieSBhIGNoaWxkIHBhZ2UgbnVtYmVyIGZp
ZWxkLiAqLwogCQkJbiA9IGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVlX2luX3RyZWUoaW5kZXgpICsg
MTsKIAkJCWJyZWFrOwogCQljYXNlIFJFQ19TVEFUVVNfSU5GSU1VTToKQEAgLTU2OSw2ICs1NzIs
OCBAQCByZWNfZ2V0X29mZnNldHNfZnVuYygKIAkJbiA9IG5fZmllbGRzOwogCX0KIAorCS8qIFRo
ZSBvZmZzZXRzIGhlYWRlciBjb25zaXN0cyBvZiB0aGUgYWxsb2NhdGlvbiBzaXplIGF0CisJb2Zm
c2V0c1swXSBhbmQgdGhlIFJFQ19PRkZTX0hFQURFUl9TSVpFIGJ5dGVzLiAqLwogCXNpemUgPSBu
ICsgKDEgKyBSRUNfT0ZGU19IRUFERVJfU0laRSk7CiAKIAlpZiAoVU5JVl9VTkxJS0VMWSghb2Zm
c2V0cykKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku