From: marko.makela
Date: June 30 2011 10:56am
Subject: bzr push into mysql-5.1 branch (marko.makela:3661 to 3662) Bug#12637786
List-Archive: http://lists.mysql.com/commits/140114
X-Bug: 12637786
Message-Id: <201106301056.p5UAupwN008312@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2NjIgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0zMAogICAgICBCdWcjMTI2Mzc3ODYgV3Jvbmcg
c2Vjb25kYXJ5IGluZGV4IGVudHJpZXMgb24gQ0hBUiBhbmQgVkFSQ0hBUiBjb2x1bW5zCiAgICAg
IAogICAgICByb3dfYnVpbGRfaW5kZXhfZW50cnkoKTogSW4gaW5ub2RiX2ZpbGVfZm9ybWF0PUJh
cnJhY3VkYQogICAgICAoUk9XX0ZPUk1BVD1EWU5BTUlDIG9yIFJPV19GT1JNQVQ9Q09NUFJFU1NF
RCksIGEgc2Vjb25kYXJ5IGluZGV4IG9uIGEKICAgICAgZnVsbCBjb2x1bW4gY2FuIHJlZmVyIHRv
IGEgZmllbGQgdGhhdCBpcyBzdG9yZWQgb2ZmLXBhZ2UgaW4gdGhlCiAgICAgIGNsdXN0ZXJlZCBp
bmRleCByZWNvcmQuIFRha2UgdGhhdCBpbnRvIGFjY291bnQuCiAgICAgIAogICAgICByYjo2OTIg
YXBwcm92ZWQgYnkgSmltbXkgWWFuZwoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1
aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv
c3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYi1pbmRleC50ZXN0CiAgICAgIHN0b3JhZ2UvaW5u
b2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cw
cm93LmMKIDM2NjEgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0yOQogICAgICBCdWcgIzEyNjEyMTg0
IEJMT0IgZGVidWcgY29kZSBjbGVhbnVwOiBGb3Jnb3QgYW4gI2lmCiAgICAgIGFyb3VuZCB0aGUg
ZGVjbGFyYXRpb24gb2YgdHJ4X2Fzc2VydF9yZWNvdmVyZWQoKS4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvdHJ4MHN5cy5oCj09PSBtb2RpZmllZCBm
aWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItaW5kZXgucmVzdWx0
JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItaW5kZXgucmVz
dWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjI5MTM0ODQxLTVjNzNmMHMx
Nnc2b2pjOG4KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiLWlu
ZGV4LnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYzMDEwMTg1NC00
M2F5eXhtOXN3cHo5aXFhCkBAIC05NjcsNiArOTY3LDE5IEBAIEVSUk9SIEhZMDAwOiBUb28gYmln
IHJvdwogYWx0ZXIgdGFibGUgdDEgcm93X2Zvcm1hdD1jb21wYWN0OwogY3JlYXRlIGluZGV4IHQx
dSBvbiB0MSAodSgxKSk7CiBkcm9wIHRhYmxlIHQxOworU0VUIEByPVJFUEVBVCgnYScsNTAwKTsK
K0NSRUFURSBUQUJMRSB0MShhIElOVCwKK3YxIFZBUkNIQVIoNTAwKSwgdjIgVkFSQ0hBUig1MDAp
LCB2MyBWQVJDSEFSKDUwMCksCit2NCBWQVJDSEFSKDUwMCksIHY1IFZBUkNIQVIoNTAwKSwgdjYg
VkFSQ0hBUig1MDApLAordjcgVkFSQ0hBUig1MDApLCB2OCBWQVJDSEFSKDUwMCksIHY5IFZBUkNI
QVIoNTAwKSwKK3YxMCBWQVJDSEFSKDUwMCksIHYxMSBWQVJDSEFSKDUwMCksIHYxMiBWQVJDSEFS
KDUwMCksCit2MTMgVkFSQ0hBUig1MDApLCB2MTQgVkFSQ0hBUig1MDApLCB2MTUgVkFSQ0hBUig1
MDApLAordjE2IFZBUkNIQVIoNTAwKSwgdjE3IFZBUkNIQVIoNTAwKSwgdjE4IFZBUkNIQVIoNTAw
KQorKSBFTkdJTkU9SW5ub0RCIFJPV19GT1JNQVQ9RFlOQU1JQzsKK0NSRUFURSBJTkRFWCBpZHgx
IE9OIHQxKGEsdjEpOworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDksQHIsQHIsQHIsQHIsQHIsQHIs
QHIsQHIsQHIsQHIsQHIsQHIsQHIsQHIsQHIsQHIsQHIsQHIpOworVVBEQVRFIHQxIFNFVCBhPTEw
MDA7CitEUk9QIFRBQkxFIHQxOwogc2V0IGdsb2JhbCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9MDsK
IHNldCBnbG9iYWwgaW5ub2RiX2ZpbGVfZm9ybWF0PUFudGVsb3BlOwogc2V0IGdsb2JhbCBpbm5v
ZGJfZmlsZV9mb3JtYXRfY2hlY2s9QW50ZWxvcGU7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwt
dGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiLWluZGV4LnRlc3QnCi0tLSBhL215c3Fs
LXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjI5MTM0ODQxLTVjNzNmMHMxNnc2b2pjOG4KKysrIGIv
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MzAxMDE4NTQtNDNheXl4bTlzd3B6OWlxYQpA
QCAtNDA0LDYgKzQwNCwyMiBAQCBhbHRlciB0YWJsZSB0MSByb3dfZm9ybWF0PWNvbXBhY3Q7CiBj
cmVhdGUgaW5kZXggdDF1IG9uIHQxICh1KDEpKTsKIAogZHJvcCB0YWJsZSB0MTsKKworIyBCdWcj
MTI2Mzc3ODYKK1NFVCBAcj1SRVBFQVQoJ2EnLDUwMCk7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQs
CisgdjEgVkFSQ0hBUig1MDApLCB2MiBWQVJDSEFSKDUwMCksIHYzIFZBUkNIQVIoNTAwKSwKKyB2
NCBWQVJDSEFSKDUwMCksIHY1IFZBUkNIQVIoNTAwKSwgdjYgVkFSQ0hBUig1MDApLAorIHY3IFZB
UkNIQVIoNTAwKSwgdjggVkFSQ0hBUig1MDApLCB2OSBWQVJDSEFSKDUwMCksCisgdjEwIFZBUkNI
QVIoNTAwKSwgdjExIFZBUkNIQVIoNTAwKSwgdjEyIFZBUkNIQVIoNTAwKSwKKyB2MTMgVkFSQ0hB
Uig1MDApLCB2MTQgVkFSQ0hBUig1MDApLCB2MTUgVkFSQ0hBUig1MDApLAorIHYxNiBWQVJDSEFS
KDUwMCksIHYxNyBWQVJDSEFSKDUwMCksIHYxOCBWQVJDSEFSKDUwMCkKKykgRU5HSU5FPUlubm9E
QiBST1dfRk9STUFUPURZTkFNSUM7CitDUkVBVEUgSU5ERVggaWR4MSBPTiB0MShhLHYxKTsKK0lO
U0VSVCBJTlRPIHQxIFZBTFVFUyg5LEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEBy
LEByLEByLEByLEByLEByLEByKTsKK1VQREFURSB0MSBTRVQgYT0xMDAwOworRFJPUCBUQUJMRSB0
MTsKKwogZXZhbCBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX3Blcl90YWJsZT0kcGVyX3RhYmxlOwog
ZXZhbCBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX2Zvcm1hdD0kZm9ybWF0OwogZXZhbCBzZXQgZ2xv
YmFsIGlubm9kYl9maWxlX2Zvcm1hdF9jaGVjaz0kZm9ybWF0OwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA2MjkxMzQ4
NDEtNWM3M2YwczE2dzZvamM4bgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjMwMTAxODU0LTQzYXl5eG05c3dw
ejlpcWEKQEAgLTEsMyArMSw5IEBACisyMDExLTA2LTMwCVRoZSBJbm5vREIgVGVhbQorCisJKiBy
b3cvcm93MHJvdy5jOgorCUZpeCBCdWcjMTI2Mzc3ODYgV3Jvbmcgc2Vjb25kYXJ5IGluZGV4IGVu
dHJpZXMgb24gQ0hBUiBhbmQgVkFSQ0hBUgorCWNvbHVtbnMgaW4gUk9XX0ZPUk1BVD1EWU5BTUlD
IGFuZCBST1dfRk9STUFUPUNPTVBSRVNTRUQKKwogMjAxMS0wNi0xNglUaGUgSW5ub0RCIFRlYW0K
IAogCSogYnRyL2J0cjBjdXIuYywgYnVmL2J1ZjBidWRkeS5jLCBidWYvYnVmMGJ1Zi5jLCBidWYv
YnVmMGxydS5jLAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cv
cm93MHJvdy5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzByb3cuYwlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDYyOTEzNDg0MS01YzczZjBzMTZ3Nm9qYzhu
CisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MHJvdy5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNjMwMTAxODU0LTQzYXl5eG05c3dwejlpcWEKQEAgLTEwMSwx
MiArMTAxLDI3IEBAIHJvd19idWlsZF9pbmRleF9lbnRyeSgKIAogCQlkZmllbGRfY29weShkZmll
bGQsIGRmaWVsZDIpOwogCi0JCWlmIChkZmllbGRfaXNfbnVsbChkZmllbGQpIHx8IGluZF9maWVs
ZC0+cHJlZml4X2xlbiA9PSAwKSB7CisJCWlmIChkZmllbGRfaXNfbnVsbChkZmllbGQpKSB7CiAJ
CQljb250aW51ZTsKIAkJfQogCi0JCS8qIElmIGEgY29sdW1uIHByZWZpeCBpbmRleCwgdGFrZSBv
bmx5IHRoZSBwcmVmaXguCi0JCVByZWZpeC1pbmRleGVkIGNvbHVtbnMgbWF5IGJlIGV4dGVybmFs
bHkgc3RvcmVkLiAqLworCQlpZiAoaW5kX2ZpZWxkLT5wcmVmaXhfbGVuID09IDAKKwkJICAgICYm
ICghZGZpZWxkX2lzX2V4dChkZmllbGQpCisJCQl8fCBkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4
KSkpIHsKKwkJCS8qIFRoZSBkZmllbGRfY29weSgpIGFib3ZlIHN1ZmZpY2VzIGZvcgorCQkJY29s
dW1ucyB0aGF0IGFyZSBzdG9yZWQgaW4tcGFnZSwgb3IgZm9yCisJCQljbHVzdGVyZWQgaW5kZXgg
cmVjb3JkIGNvbHVtbnMgdGhhdCBhcmUgbm90CisJCQlwYXJ0IG9mIGEgY29sdW1uIHByZWZpeCBp
biB0aGUgUFJJTUFSWSBLRVkuICovCisJCQljb250aW51ZTsKKwkJfQorCisJCS8qIElmIHRoZSBj
b2x1bW4gaXMgc3RvcmVkIGV4dGVybmFsbHkgKG9mZi1wYWdlKSBpbgorCQl0aGUgY2x1c3RlcmVk
IGluZGV4LCBpdCBtdXN0IGJlIGFuIG9yZGVyaW5nIGZpZWxkIGluCisJCXRoZSBzZWNvbmRhcnkg
aW5kZXguICBJbiB0aGUgQW50ZWxvcGUgZm9ybWF0LCBvbmx5CisJCXByZWZpeC1pbmRleGVkIGNv
bHVtbnMgbWF5IGJlIHN0b3JlZCBvZmYtcGFnZSBpbiB0aGUKKwkJY2x1c3RlcmVkIGluZGV4IHJl
Y29yZC4gSW4gdGhlIEJhcnJhY3VkYSBmb3JtYXQsIGFsc28KKwkJZnVsbHkgaW5kZXhlZCBsb25n
IENIQVIgb3IgVkFSQ0hBUiBjb2x1bW5zIG1heSBiZQorCQlzdG9yZWQgb2ZmLXBhZ2UuICovCiAJ
CXV0X2FkKGNvbC0+b3JkX3BhcnQpOwogCiAJCWlmIChVTklWX0xJS0VMWV9OVUxMKGV4dCkpIHsK
QEAgLTExOSwxMyArMTM0LDM0IEBAIHJvd19idWlsZF9pbmRleF9lbnRyeSgKIAkJCQl9CiAJCQkJ
ZGZpZWxkX3NldF9kYXRhKGRmaWVsZCwgYnVmLCBsZW4pOwogCQkJfQorCisJCQlpZiAoaW5kX2Zp
ZWxkLT5wcmVmaXhfbGVuID09IDApIHsKKwkJCQkvKiBJbiB0aGUgQmFycmFjdWRhIGZvcm1hdAor
CQkJCShST1dfRk9STUFUPURZTkFNSUMgb3IKKwkJCQlST1dfRk9STUFUPUNPTVBSRVNTRUQpLCB3
ZSBjYW4gaGF2ZSBhCisJCQkJc2Vjb25kYXJ5IGluZGV4IG9uIGFuIGVudGlyZSBjb2x1bW4KKwkJ
CQl0aGF0IGlzIHN0b3JlZCBvZmYtcGFnZSBpbiB0aGUKKwkJCQljbHVzdGVyZWQgaW5kZXguIEFz
IHRoaXMgaXMgbm90IGEKKwkJCQlwcmVmaXggaW5kZXggKHByZWZpeF9sZW4gPT0gMCksCisJCQkJ
aW5jbHVkZSB0aGUgZW50aXJlIG9mZi1wYWdlIGNvbHVtbiBpbgorCQkJCXRoZSBzZWNvbmRhcnkg
aW5kZXggcmVjb3JkLiAqLworCQkJCWNvbnRpbnVlOworCQkJfQogCQl9IGVsc2UgaWYgKGRmaWVs
ZF9pc19leHQoZGZpZWxkKSkgeworCQkJLyogVGhpcyB0YWJsZSBzaG91bGQgYmUgaW4gQW50ZWxv
cGUgZm9ybWF0CisJCQkoUk9XX0ZPUk1BVD1SRURVTkRBTlQgb3IgUk9XX0ZPUk1BVD1DT01QQUNU
KS4KKwkJCUluIHRoYXQgZm9ybWF0LCB0aGUgbWF4aW11bSBjb2x1bW4gcHJlZml4CisJCQlpbmRl
eCBsZW5ndGggaXMgNzY3IGJ5dGVzLCBhbmQgdGhlIGNsdXN0ZXJlZAorCQkJaW5kZXggcmVjb3Jk
IGNvbnRhaW5zIGEgNzY4LWJ5dGUgcHJlZml4IG9mCisJCQllYWNoIG9mZi1wYWdlIGNvbHVtbi4g
Ki8KIAkJCXV0X2EobGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUpOwogCQkJbGVuIC09
IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkU7CiAJCQl1dF9hKGluZF9maWVsZC0+cHJlZml4X2xl
biA8PSBsZW4KIAkJCSAgICAgfHwgZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOwogCQl9CiAK
KwkJLyogSWYgYSBjb2x1bW4gcHJlZml4IGluZGV4LCB0YWtlIG9ubHkgdGhlIHByZWZpeC4gKi8K
KwkJdXRfYWQoaW5kX2ZpZWxkLT5wcmVmaXhfbGVuKTsKIAkJbGVuID0gZHR5cGVfZ2V0X2F0X21v
c3Rfbl9tYmNoYXJzKAogCQkJY29sLT5wcnR5cGUsIGNvbC0+bWJtaW5sZW4sIGNvbC0+bWJtYXhs
ZW4sCiAJCQlpbmRfZmllbGQtPnByZWZpeF9sZW4sIGxlbiwgZGZpZWxkX2dldF9kYXRhKGRmaWVs
ZCkpOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=