From: marko.makela
Date: October 21 2011 4:14am
Subject: bzr push into mysql-5.1 branch (marko.makela:3628 to 3629) Bug#13116045
List-Archive: http://lists.mysql.com/commits/141524
X-Bug: 13116045
Message-Id: <201110210414.p9L4E4Z5015078@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MjkgTWFya28gTcOka2Vsw6QJMjAxMS0xMC0yMQogICAgICBCdWcjMTMxMTYwNDUgQ29tcGls
YXRpb24gZmFpbHVyZSB1c2luZyBHQ0MgNC42LjEgaW4gYnRyL2J0cjBjdXIuYwogICAgICAKICAg
ICAgYnRyX3JlY29yZF9ub3RfbnVsbF9maWVsZF9pbl9yZWMoKTogUmVtb3ZlIHRoZSBwYXJhbWV0
ZXIgcmVjLgogICAgICBVc2UgcmVjX29mZnNfbnRoX3NxbF9udWxsKCkgaW5zdGVhZCBvZiByZWNf
Z2V0X250aF9maWVsZCgpLgogICAgICAKICAgICAgcmI6Nzg4IGFwcHJvdmVkIGJ5IEppbW15IFlh
bmcKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jCiAg
ICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2J0ci9idHIwY3VyLmMKIDM2MjggQmpvcm4gTXVuY2gJMjAxMS0xMC0xOQogICAgICBS
ZW1vdmUgY29weXJpZ2h0IGhlYWRlciBmcm9tIHBhcnNlcl9zdGFjay50ZXN0CgogICAgbW9kaWZp
ZWQ6CiAgICAgIG15c3FsLXRlc3QvdC9wYXJzZXJfc3RhY2sudGVzdAo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2J0ci9idHIwY3VyLmMJcmV2aWQ6Ympvcm4ubXVuY2hAb3JhY2xlLmNvbS0yMDExMTAxOTExMzY1
Ny0ydmo5cnBkN2d3OXVueW9qCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTAyMTAzMzIxNi1tajdoczQyZXpodmF1
YWM2CkBAIC0yODY0LDcgKzI4NjQsNiBAQCBzdGF0aWMKIHZvaWQKIGJ0cl9yZWNvcmRfbm90X251
bGxfZmllbGRfaW5fcmVjKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0JcmVj
X3QqCQlyZWMsCQkvKiBpbjogcGh5c2ljYWwgcmVjb3JkICovCiAJdWxpbnQJCW5fdW5pcXVlLAkv
KiBpbjogZGljdF9pbmRleF9nZXRfbl91bmlxdWUoaW5kZXgpLAogCQkJCQludW1iZXIgb2YgY29s
dW1ucyB1bmlxdWVseSBkZXRlcm1pbmUKIAkJCQkJYW4gaW5kZXggZW50cnkgKi8KQEAgLTI4ODMs
MTcgKzI4ODIsMTEgQEAgYnRyX3JlY29yZF9ub3RfbnVsbF9maWVsZF9pbl9yZWMoCiAJfQogCiAJ
Zm9yIChpID0gMDsgaSA8IG5fdW5pcXVlOyBpKyspIHsKLQkJdWxpbnQJcmVjX2xlbjsKLQkJYnl0
ZSoJZmllbGQ7Ci0KLQkJZmllbGQgPSByZWNfZ2V0X250aF9maWVsZChyZWMsIG9mZnNldHMsIGks
ICZyZWNfbGVuKTsKLQotCQlpZiAocmVjX2xlbiAhPSBVTklWX1NRTF9OVUxMKSB7Ci0JCQluX25v
dF9udWxsW2ldKys7Ci0JCX0gZWxzZSB7Ci0JCQkvKiBCcmVhayBpZiB3ZSBoaXQgdGhlIGZpcnN0
IE5VTEwgdmFsdWUgKi8KKwkJaWYgKHJlY19vZmZzX250aF9zcWxfbnVsbChvZmZzZXRzLCBpKSkg
ewogCQkJYnJlYWs7CiAJCX0KKworCQluX25vdF9udWxsW2ldKys7CiAJfQogfQogCkBAIC0yOTg4
LDcgKzI5ODEsNyBAQCBidHJfZXN0aW1hdGVfbnVtYmVyX29mX2RpZmZlcmVudF9rZXlfdmFsCiAK
IAkJCWlmIChuX25vdF9udWxsKSB7CiAJCQkJYnRyX3JlY29yZF9ub3RfbnVsbF9maWVsZF9pbl9y
ZWMoCi0JCQkJCXJlYywgbl9jb2xzLCBvZmZzZXRzX3JlYywgbl9ub3RfbnVsbCk7CisJCQkJCW5f
Y29scywgb2Zmc2V0c19yZWMsIG5fbm90X251bGwpOwogCQkJfQogCQl9CiAKQEAgLTMwMjMsOCAr
MzAxNiw3IEBAIGJ0cl9lc3RpbWF0ZV9udW1iZXJfb2ZfZGlmZmVyZW50X2tleV92YWwKIAogCQkJ
aWYgKG5fbm90X251bGwpIHsKIAkJCQlidHJfcmVjb3JkX25vdF9udWxsX2ZpZWxkX2luX3JlYygK
LQkJCQkJbmV4dF9yZWMsIG5fY29scywgb2Zmc2V0c19uZXh0X3JlYywKLQkJCQkJbl9ub3RfbnVs
bCk7CisJCQkJCW5fY29scywgb2Zmc2V0c19uZXh0X3JlYywgbl9ub3RfbnVsbCk7CiAJCQl9CiAK
IAkJCXRvdGFsX2V4dGVybmFsX3NpemUKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CXJldmlkOmJqb3JuLm11bmNoQG9yYWNsZS5jb20tMjAxMTEwMTkxMTM2NTctMnZqOXJwZDdndzl1
bnlvagorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTExMDIxMDMzMjE2LW1qN2hzNDJlemh2YXVhYzYKQEAgLTEsMyAr
MSw4IEBACisyMDExLTEwLTIwCVRoZSBJbm5vREIgVGVhbQorCisJKiBidHIvYnJ0MGN1ci5jOgor
CUZpeCBCdWcjMTMxMTYwNDUgQ29tcGlsYXRpb24gZmFpbHVyZSB1c2luZyBHQ0MgNC42LjEgaW4g
YnRyL2J0cjBjdXIuYworCiAyMDExLTEwLTEyCVRoZSBJbm5vREIgVGVhbQogCiAJKiBidHIvYnRy
MGN1ci5jLCBidHIvYnRyMHNlYS5jLCBidWYvYnVmMGJ1Zi5jLCBidWYvYnVmMGxydS5jLAoKPT09
IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGN1ci5jJwotLS0g
YS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBjdXIuYwlyZXZpZDpiam9ybi5tdW5jaEBv
cmFjbGUuY29tLTIwMTExMDE5MTEzNjU3LTJ2ajlycGQ3Z3c5dW55b2oKKysrIGIvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL2J0ci9idHIwY3VyLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTEwMjEwMzMyMTYtbWo3aHM0MmV6aHZhdWFjNgpAQCAtMzI2MSw3ICszMjYxLDYgQEAgc3Rh
dGljCiB2b2lkCiBidHJfcmVjb3JkX25vdF9udWxsX2ZpZWxkX2luX3JlYygKIC8qPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0qLwotCXJlY190KgkJcmVjLAkJLyohPCBpbjogcGh5c2ljYWwg
cmVjb3JkICovCiAJdWxpbnQJCW5fdW5pcXVlLAkvKiE8IGluOiBkaWN0X2luZGV4X2dldF9uX3Vu
aXF1ZShpbmRleCksCiAJCQkJCW51bWJlciBvZiBjb2x1bW5zIHVuaXF1ZWx5IGRldGVybWluZQog
CQkJCQlhbiBpbmRleCBlbnRyeSAqLwpAQCAtMzI4MCwxNyArMzI3OSwxMSBAQCBidHJfcmVjb3Jk
X25vdF9udWxsX2ZpZWxkX2luX3JlYygKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgbl91bmlxdWU7
IGkrKykgewotCQl1bGludAlyZWNfbGVuOwotCQlieXRlKglmaWVsZDsKLQotCQlmaWVsZCA9IHJl
Y19nZXRfbnRoX2ZpZWxkKHJlYywgb2Zmc2V0cywgaSwgJnJlY19sZW4pOwotCi0JCWlmIChyZWNf
bGVuICE9IFVOSVZfU1FMX05VTEwpIHsKLQkJCW5fbm90X251bGxbaV0rKzsKLQkJfSBlbHNlIHsK
LQkJCS8qIEJyZWFrIGlmIHdlIGhpdCB0aGUgZmlyc3QgTlVMTCB2YWx1ZSAqLworCQlpZiAocmVj
X29mZnNfbnRoX3NxbF9udWxsKG9mZnNldHMsIGkpKSB7CiAJCQlicmVhazsKIAkJfQorCisJCW5f
bm90X251bGxbaV0rKzsKIAl9CiB9CiAKQEAgLTMzOTgsNyArMzM5MSw3IEBAIGJ0cl9lc3RpbWF0
ZV9udW1iZXJfb2ZfZGlmZmVyZW50X2tleV92YWwKIAogCQkJaWYgKG5fbm90X251bGwpIHsKIAkJ
CQlidHJfcmVjb3JkX25vdF9udWxsX2ZpZWxkX2luX3JlYygKLQkJCQkJcmVjLCBuX2NvbHMsIG9m
ZnNldHNfcmVjLCBuX25vdF9udWxsKTsKKwkJCQkJbl9jb2xzLCBvZmZzZXRzX3JlYywgbl9ub3Rf
bnVsbCk7CiAJCQl9CiAJCX0KIApAQCAtMzQzMyw4ICszNDI2LDcgQEAgYnRyX2VzdGltYXRlX251
bWJlcl9vZl9kaWZmZXJlbnRfa2V5X3ZhbAogCiAJCQlpZiAobl9ub3RfbnVsbCkgewogCQkJCWJ0
cl9yZWNvcmRfbm90X251bGxfZmllbGRfaW5fcmVjKAotCQkJCQluZXh0X3JlYywgbl9jb2xzLCBv
ZmZzZXRzX25leHRfcmVjLAotCQkJCQluX25vdF9udWxsKTsKKwkJCQkJbl9jb2xzLCBvZmZzZXRz
X25leHRfcmVjLCBuX25vdF9udWxsKTsKIAkJCX0KIAogCQkJdG90YWxfZXh0ZXJuYWxfc2l6ZQoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=