From: marko.makela
Date: June 30 2011 10:55am
Subject: bzr push into mysql-5.5 branch (marko.makela:3476 to 3477)
List-Archive: http://lists.mysql.com/commits/140142
Message-Id: <201106301055.p5UAtZ4D005930@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NzcgTWFya28gTcOka2Vsw6QJMjAxMS0wNi0zMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9k
Yi90L2lubm9kYi1pbmRleC50ZXN0CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzByb3cu
YwogMzQ3NiBNYXJjIEFsZmYJMjAxMS0wNi0yOQogICAgICBCdWcjMTI2MDMzNDEgLSBQRVJGU0NI
RU1BLlJFTEFZTE9HIEZBSUxTIFNQT1JBRElDQUxMWSBJTiBQQjIKICAgICAgCiAgICAgIEJlZm9y
ZSB0aGlzIGZpeCwgdGhlIHRlc3QgcGVyZm9ybWFuY2Vfc2NoZW1hLnJlbGF5bG9nIHdvdWxkIGZh
aWwKICAgICAgd2l0aCBzcG9yYWRpYyBmYWlsdXJlcyByZWxhdGVkIHRvIHN0YXRpc3RpY3Mgb24g
dXBkYXRlX2NvbmQuCiAgICAgIAogICAgICBUaGUgcmVhc29uIGZvciB0aGVzZSBmYWlsdXJlcyBp
cyB0aGF0IHRocmVhZCBzY2hlZHVsaW5nIG1ha2VzCiAgICAgIGltcG9zc2libGUgdG8gcHJlZGlj
dCBpZiBpbnN0cnVtZW50ZWQgY29uZGl0aW9ucyB3aWxsIGJlIHVzZWQgb24gbm90LgogICAgICAK
ICAgICAgVGhlIGZpeCBpcyB0byByZWxheCB0aGUgdGVzdCBjYXNlLCB0byBub3QgY29sbGVjdCBz
dGF0aXN0aWNzIGFib3V0OgogICAgICAtIHdhaXQvc3luY2gvY29uZC9zcWwvTVlTUUxfQklOX0xP
Rzo6dXBkYXRlX2NvbmQKICAgICAgLSB3YWl0L3N5bmNoL2NvbmQvc3FsL01ZU1FMX1JFTEFZX0xP
Rzo6dXBkYXRlX2NvbmQKCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9wZXJm
c2NoZW1hL3IvcmVsYXlsb2cucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcGVyZnNjaGVt
YS90L3JlbGF5bG9nLnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
ci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmMuYWxmZkBvcmFjbGUuY29tLTIwMTEwNjI5
MjAxODA3LTR4Y3NqZDBoazcweXYzNzgKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9p
bm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjMw
MTAyMzM0LWJ3MmZndnc2ZWZ5ZTBqdWMKQEAgLTkxOCw2ICs5MTgsMTkgQEAgRVJST1IgSFkwMDA6
IFRvbyBiaWcgcm93CiBhbHRlciB0YWJsZSB0MSByb3dfZm9ybWF0PWNvbXBhY3Q7CiBjcmVhdGUg
aW5kZXggdDF1IG9uIHQxICh1KDc2NykpOwogZHJvcCB0YWJsZSB0MTsKK1NFVCBAcj1SRVBFQVQo
J2EnLDUwMCk7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQsCit2MSBWQVJDSEFSKDUwMCksIHYyIFZB
UkNIQVIoNTAwKSwgdjMgVkFSQ0hBUig1MDApLAordjQgVkFSQ0hBUig1MDApLCB2NSBWQVJDSEFS
KDUwMCksIHY2IFZBUkNIQVIoNTAwKSwKK3Y3IFZBUkNIQVIoNTAwKSwgdjggVkFSQ0hBUig1MDAp
LCB2OSBWQVJDSEFSKDUwMCksCit2MTAgVkFSQ0hBUig1MDApLCB2MTEgVkFSQ0hBUig1MDApLCB2
MTIgVkFSQ0hBUig1MDApLAordjEzIFZBUkNIQVIoNTAwKSwgdjE0IFZBUkNIQVIoNTAwKSwgdjE1
IFZBUkNIQVIoNTAwKSwKK3YxNiBWQVJDSEFSKDUwMCksIHYxNyBWQVJDSEFSKDUwMCksIHYxOCBW
QVJDSEFSKDUwMCkKKykgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPURZTkFNSUM7CitDUkVBVEUg
SU5ERVggaWR4MSBPTiB0MShhLHYxKTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyg5LEByLEByLEBy
LEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByKTsKK1VQREFURSB0
MSBTRVQgYT0xMDAwOworRFJPUCBUQUJMRSB0MTsKIHNldCBnbG9iYWwgaW5ub2RiX2ZpbGVfcGVy
X3RhYmxlPTA7CiBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX2Zvcm1hdD1BbnRlbG9wZTsKIHNldCBn
bG9iYWwgaW5ub2RiX2ZpbGVfZm9ybWF0X21heD1BbnRlbG9wZTsKCj09PSBtb2RpZmllZCBmaWxl
ICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0JwotLS0gYS9teXNx
bC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOm1hcmMuYWxmZkBv
cmFjbGUuY29tLTIwMTEwNjI5MjAxODA3LTR4Y3NqZDBoazcweXYzNzgKKysrIGIvbXlzcWwtdGVz
dC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGItaW5kZXgudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDExMDYzMDEwMjMzNC1idzJmZ3Z3NmVmeWUwanVjCkBAIC00MDEsNiArNDAxLDIy
IEBAIGFsdGVyIHRhYmxlIHQxIHJvd19mb3JtYXQ9Y29tcGFjdDsKIGNyZWF0ZSBpbmRleCB0MXUg
b24gdDEgKHUoNzY3KSk7CiAKIGRyb3AgdGFibGUgdDE7CisKKyMgQnVnIzEyNjM3Nzg2CitTRVQg
QHI9UkVQRUFUKCdhJyw1MDApOworQ1JFQVRFIFRBQkxFIHQxKGEgSU5ULAorIHYxIFZBUkNIQVIo
NTAwKSwgdjIgVkFSQ0hBUig1MDApLCB2MyBWQVJDSEFSKDUwMCksCisgdjQgVkFSQ0hBUig1MDAp
LCB2NSBWQVJDSEFSKDUwMCksIHY2IFZBUkNIQVIoNTAwKSwKKyB2NyBWQVJDSEFSKDUwMCksIHY4
IFZBUkNIQVIoNTAwKSwgdjkgVkFSQ0hBUig1MDApLAorIHYxMCBWQVJDSEFSKDUwMCksIHYxMSBW
QVJDSEFSKDUwMCksIHYxMiBWQVJDSEFSKDUwMCksCisgdjEzIFZBUkNIQVIoNTAwKSwgdjE0IFZB
UkNIQVIoNTAwKSwgdjE1IFZBUkNIQVIoNTAwKSwKKyB2MTYgVkFSQ0hBUig1MDApLCB2MTcgVkFS
Q0hBUig1MDApLCB2MTggVkFSQ0hBUig1MDApCispIEVOR0lORT1Jbm5vREIgUk9XX0ZPUk1BVD1E
WU5BTUlDOworQ1JFQVRFIElOREVYIGlkeDEgT04gdDEoYSx2MSk7CitJTlNFUlQgSU5UTyB0MSBW
QUxVRVMoOSxAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixAcixA
cixAcik7CitVUERBVEUgdDEgU0VUIGE9MTAwMDsKK0RST1AgVEFCTEUgdDE7CisKIGV2YWwgc2V0
IGdsb2JhbCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9JHBlcl90YWJsZTsKIGV2YWwgc2V0IGdsb2Jh
bCBpbm5vZGJfZmlsZV9mb3JtYXQ9JGZvcm1hdDsKIGV2YWwgc2V0IGdsb2JhbCBpbm5vZGJfZmls
ZV9mb3JtYXRfbWF4PSRmb3JtYXQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHJvdy5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2
aWQ6bWFyYy5hbGZmQG9yYWNsZS5jb20tMjAxMTA2MjkyMDE4MDctNHhjc2pkMGhrNzB5djM3OAor
KysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTA2MzAxMDIzMzQtYncyZmd2dzZlZnllMGp1YwpAQCAtMTAxLDEyICsxMDEs
MjcgQEAgcm93X2J1aWxkX2luZGV4X2VudHJ5KAogCiAJCWRmaWVsZF9jb3B5KGRmaWVsZCwgZGZp
ZWxkMik7CiAKLQkJaWYgKGRmaWVsZF9pc19udWxsKGRmaWVsZCkgfHwgaW5kX2ZpZWxkLT5wcmVm
aXhfbGVuID09IDApIHsKKwkJaWYgKGRmaWVsZF9pc19udWxsKGRmaWVsZCkpIHsKIAkJCWNvbnRp
bnVlOwogCQl9CiAKLQkJLyogSWYgYSBjb2x1bW4gcHJlZml4IGluZGV4LCB0YWtlIG9ubHkgdGhl
IHByZWZpeC4KLQkJUHJlZml4LWluZGV4ZWQgY29sdW1ucyBtYXkgYmUgZXh0ZXJuYWxseSBzdG9y
ZWQuICovCisJCWlmIChpbmRfZmllbGQtPnByZWZpeF9sZW4gPT0gMAorCQkgICAgJiYgKCFkZmll
bGRfaXNfZXh0KGRmaWVsZCkKKwkJCXx8IGRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpKSkgewor
CQkJLyogVGhlIGRmaWVsZF9jb3B5KCkgYWJvdmUgc3VmZmljZXMgZm9yCisJCQljb2x1bW5zIHRo
YXQgYXJlIHN0b3JlZCBpbi1wYWdlLCBvciBmb3IKKwkJCWNsdXN0ZXJlZCBpbmRleCByZWNvcmQg
Y29sdW1ucyB0aGF0IGFyZSBub3QKKwkJCXBhcnQgb2YgYSBjb2x1bW4gcHJlZml4IGluIHRoZSBQ
UklNQVJZIEtFWS4gKi8KKwkJCWNvbnRpbnVlOworCQl9CisKKwkJLyogSWYgdGhlIGNvbHVtbiBp
cyBzdG9yZWQgZXh0ZXJuYWxseSAob2ZmLXBhZ2UpIGluCisJCXRoZSBjbHVzdGVyZWQgaW5kZXgs
IGl0IG11c3QgYmUgYW4gb3JkZXJpbmcgZmllbGQgaW4KKwkJdGhlIHNlY29uZGFyeSBpbmRleC4g
IEluIHRoZSBBbnRlbG9wZSBmb3JtYXQsIG9ubHkKKwkJcHJlZml4LWluZGV4ZWQgY29sdW1ucyBt
YXkgYmUgc3RvcmVkIG9mZi1wYWdlIGluIHRoZQorCQljbHVzdGVyZWQgaW5kZXggcmVjb3JkLiBJ
biB0aGUgQmFycmFjdWRhIGZvcm1hdCwgYWxzbworCQlmdWxseSBpbmRleGVkIGxvbmcgQ0hBUiBv
ciBWQVJDSEFSIGNvbHVtbnMgbWF5IGJlCisJCXN0b3JlZCBvZmYtcGFnZS4gKi8KIAkJdXRfYWQo
Y29sLT5vcmRfcGFydCk7CiAKIAkJaWYgKFVOSVZfTElLRUxZX05VTEwoZXh0KSkgewpAQCAtMTE5
LDExICsxMzQsMzIgQEAgcm93X2J1aWxkX2luZGV4X2VudHJ5KAogCQkJCX0KIAkJCQlkZmllbGRf
c2V0X2RhdGEoZGZpZWxkLCBidWYsIGxlbik7CiAJCQl9CisKKwkJCWlmIChpbmRfZmllbGQtPnBy
ZWZpeF9sZW4gPT0gMCkgeworCQkJCS8qIEluIHRoZSBCYXJyYWN1ZGEgZm9ybWF0CisJCQkJKFJP
V19GT1JNQVQ9RFlOQU1JQyBvcgorCQkJCVJPV19GT1JNQVQ9Q09NUFJFU1NFRCksIHdlIGNhbiBo
YXZlIGEKKwkJCQlzZWNvbmRhcnkgaW5kZXggb24gYW4gZW50aXJlIGNvbHVtbgorCQkJCXRoYXQg
aXMgc3RvcmVkIG9mZi1wYWdlIGluIHRoZQorCQkJCWNsdXN0ZXJlZCBpbmRleC4gQXMgdGhpcyBp
cyBub3QgYQorCQkJCXByZWZpeCBpbmRleCAocHJlZml4X2xlbiA9PSAwKSwKKwkJCQlpbmNsdWRl
IHRoZSBlbnRpcmUgb2ZmLXBhZ2UgY29sdW1uIGluCisJCQkJdGhlIHNlY29uZGFyeSBpbmRleCBy
ZWNvcmQuICovCisJCQkJY29udGludWU7CisJCQl9CiAJCX0gZWxzZSBpZiAoZGZpZWxkX2lzX2V4
dChkZmllbGQpKSB7CisJCQkvKiBUaGlzIHRhYmxlIHNob3VsZCBiZSBpbiBBbnRlbG9wZSBmb3Jt
YXQKKwkJCShST1dfRk9STUFUPVJFRFVOREFOVCBvciBST1dfRk9STUFUPUNPTVBBQ1QpLgorCQkJ
SW4gdGhhdCBmb3JtYXQsIHRoZSBtYXhpbXVtIGNvbHVtbiBwcmVmaXgKKwkJCWluZGV4IGxlbmd0
aCBpcyA3NjcgYnl0ZXMsIGFuZCB0aGUgY2x1c3RlcmVkCisJCQlpbmRleCByZWNvcmQgY29udGFp
bnMgYSA3NjgtYnl0ZSBwcmVmaXggb2YKKwkJCWVhY2ggb2ZmLXBhZ2UgY29sdW1uLiAqLwogCQkJ
dXRfYShsZW4gPj0gQlRSX0VYVEVSTl9GSUVMRF9SRUZfU0laRSk7CiAJCQlsZW4gLT0gQlRSX0VY
VEVSTl9GSUVMRF9SRUZfU0laRTsKIAkJfQogCisJCS8qIElmIGEgY29sdW1uIHByZWZpeCBpbmRl
eCwgdGFrZSBvbmx5IHRoZSBwcmVmaXguICovCisJCXV0X2FkKGluZF9maWVsZC0+cHJlZml4X2xl
bik7CiAJCWxlbiA9IGR0eXBlX2dldF9hdF9tb3N0X25fbWJjaGFycygKIAkJCWNvbC0+cHJ0eXBl
LCBjb2wtPm1ibWlubWF4bGVuLAogCQkJaW5kX2ZpZWxkLT5wcmVmaXhfbGVuLCBsZW4sIGRmaWVs
ZF9nZXRfZGF0YShkZmllbGQpKTsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNo
IGVtYWlscyku