From: marko.makela
Date: November 8 2011 12:39pm
Subject: bzr push into mysql-5.1 branch (marko.makela:3637 to 3638) Bug#13358468
List-Archive: http://lists.mysql.com/commits/141855
X-Bug: 13358468
Message-Id: <201111081239.pA8Cdgv7024361@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MzggTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wOAogICAgICBCdWcjMTMzNTg0NjggQVNTRVJU
SU9OIEZBSUxVUkUgSU4gQlRSX1BDVVJfR0VUX0JMT0NLCiAgICAgIAogICAgICBidHJfcGN1cl9y
ZXN0b3JlX3Bvc2l0aW9uX2Z1bmMoKTogV2hlbiB0aGUgY3Vyc29yIHdhcyBwb3NpdGlvbmVkIGF0
CiAgICAgIHRoZSB0cmVlIGluZmltdW0gb3Igc3VwcmVtdW0sIGluaXRpYWxpemUgcG9zX3N0YXRl
IGFuZCBsYXRjaF9tb2RlLiBUaGUKICAgICAgYXNzZXJ0aW9uIGZhaWxlZCwgYmVjYXVzZSBwb3Nf
c3RhdGUgd2FzIEJUUl9QQ1VSX1dBU19QT1NJVElPTkVELiAgSW4KICAgICAgdGhlIHRlc3QgZmFp
bHVyZSBvZiBXTCM1ODc0LCB0aGUgcHVyZ2UgdGhyZWFkIGF0dGVtcHRlZCB0byByZXN0b3JlIHRo
ZQogICAgICBjdXJzb3IgcG9zaXRpb24gb24gdGhlIGluZmltdW0gcmVjb3JkICh0aGUgY2x1c3Rl
cmVkIGluZGV4IHdhcyBlbXB0eSkuCiAgICAgIAogICAgICBidHJfcGN1cl9kZXRhY2goKSwgYnRy
X3BjdXJfaXNfZGV0YWNoZWQoKTogVW51c2VkIGZ1bmN0aW9ucywgcmVtb3ZlLgogICAgICAKICAg
ICAgcmI6ODA0IGFwcHJvdmVkIGJ5IEluYWFtIFJhbmEKCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnRyL2J0cjBwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvYnRyMHBj
dXIuaAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwcGN1ci5pYwogMzYz
NyBNYXJrbyBNw6RrZWzDpAkyMDExLTExLTA3CiAgICAgIEFkZCBkZWJ1ZyBhc3NlcnRpb25zIHRv
IGNhdGNoIEJ1ZyMxMzM0NTM3OCBlYXJsaWVyLgogICAgICAKICAgICAgSW4gYWxsIGNhbGxlcnMg
b2Ygcm93X3NlbF9jb252ZXJ0X215c3FsX2tleV90b19pbm5vYmFzZSgpLCBhc3NlcnQKICAgICAg
dGhhdCB0aGUgY29udmVydGVkIGtleSBpcyBlbXB0eSBvciBub25lbXB0eSB3aGVuIGl0IHNob3Vs
ZCBiZS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lu
bm9kYi5jYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9oYV9pbm5vZGIuY2MK
PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBh
L3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMTExMDcxMTM3MTktZ2VhZTllYTJ0cHkxbGk1MgorKysgYi9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA4
MTIxNTIyLWh5ZnF4azUzM2E5Ym5ua2YKQEAgLTEsNyArMSwxMiBAQAorMjAxMS0xMS0wOAlUaGUg
SW5ub0RCIFRlYW0KKworCSogYnRyL2J0cjBwY3VyLmMsIGluY2x1ZGUvYnRyMHBjdXIuaCwgaW5j
bHVkZS9idHIwcGN1ci5pYzoKKwlGaXggQnVnIzEzMzU4NDY4IEFTU0VSVElPTiBGQUlMVVJFIElO
IEJUUl9QQ1VSX0dFVF9CTE9DSworCiAyMDExLTEwLTI3CVRoZSBJbm5vREIgVGVhbQogCiAJKiBy
b3cvcm93MG15c3FsLmM6Ci0JRml4IEJ1ZyAjMTI4ODQ2MzEgNjIxNDY6IFRBQkxFUyBBUkUgTE9T
VCBGT1IgRERMCisJRml4IEJ1ZyMxMjg4NDYzMSA2MjE0NjogVEFCTEVTIEFSRSBMT1NUIEZPUiBE
REwKIAogMjAxMS0xMC0yMAlUaGUgSW5ub0RCIFRlYW0KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMHBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2J0ci9idHIwcGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEx
MTA3MTEzNzE5LWdlYWU5ZWEydHB5MWxpNTIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0
ci9idHIwcGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA4MTIxNTIy
LWh5ZnF4azUzM2E5Ym5ua2YKQEAgLTI0Nyw2ICsyNDcsOCBAQCBidHJfcGN1cl9yZXN0b3JlX3Bv
c2l0aW9uX2Z1bmMoCiAJCQljdXJzb3ItPnJlbF9wb3MgPT0gQlRSX1BDVVJfQkVGT1JFX0ZJUlNU
X0lOX1RSRUUsCiAJCQlpbmRleCwgbGF0Y2hfbW9kZSwgYnRyX3BjdXJfZ2V0X2J0cl9jdXIoY3Vy
c29yKSwgbXRyKTsKIAorCQljdXJzb3ItPmxhdGNoX21vZGUgPSBsYXRjaF9tb2RlOworCQljdXJz
b3ItPnBvc19zdGF0ZSA9IEJUUl9QQ1VSX0lTX1BPU0lUSU9ORUQ7CiAJCWN1cnNvci0+YmxvY2tf
d2hlbl9zdG9yZWQgPSBidHJfcGN1cl9nZXRfYmxvY2soY3Vyc29yKTsKIAogCQlyZXR1cm4oRkFM
U0UpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0
cjBwY3VyLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL2J0cjBwY3VyLmgJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDcxMTM3MTktZ2VhZTllYTJ0cHkx
bGk1MgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9idHIwcGN1ci5oCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA4MTIxNTIyLWh5ZnF4azUzM2E5Ym5ua2YK
QEAgLTI3OSwxNCArMjc5LDYgQEAgYnRyX3BjdXJfY29tbWl0X3NwZWNpZnlfbXRyKAogLyo9PT09
PT09PT09PT09PT09PT09PT09PT0qLwogCWJ0cl9wY3VyX3QqCXBjdXIsCS8qITwgaW46IHBlcnNp
c3RlbnQgY3Vyc29yICovCiAJbXRyX3QqCQltdHIpOwkvKiE8IGluOiBtdHIgdG8gY29tbWl0ICov
Ci0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKiovLyoqCi1UZXN0cyBpZiBhIGN1cnNvciBpcyBkZXRhY2hlZDogdGhhdCBpcyB0aGUg
bGF0Y2ggbW9kZSBpcyBCVFJfTk9fTEFUQ0hFUy4KLUByZXR1cm4JVFJVRSBpZiBkZXRhY2hlZCAq
LwotVU5JVl9JTkxJTkUKLWlib29sCi1idHJfcGN1cl9pc19kZXRhY2hlZCgKLS8qPT09PT09PT09
PT09PT09PT0qLwotCWJ0cl9wY3VyX3QqCXBjdXIpOwkvKiE8IGluOiBwZXJzaXN0ZW50IGN1cnNv
ciAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKIE1vdmVzIHRoZSBwZXJzaXN0ZW50IGN1cnNvciB0byB0aGUgbmV4dCByZWNv
cmQgaW4gdGhlIHRyZWUuIElmIG5vIHJlY29yZHMgYXJlCiBsZWZ0LCB0aGUgY3Vyc29yIHN0YXlz
ICdhZnRlciBsYXN0IGluIHRyZWUnLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9pbmNsdWRlL2J0cjBwY3VyLmljJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
aW5jbHVkZS9idHIwcGN1ci5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEw
NzExMzcxOS1nZWFlOWVhMnRweTFsaTUyCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNs
dWRlL2J0cjBwY3VyLmljCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA4MTIx
NTIyLWh5ZnF4azUzM2E5Ym5ua2YKQEAgLTQxNiwzOCArNDE2LDYgQEAgYnRyX3BjdXJfY29tbWl0
X3NwZWNpZnlfbXRyKAogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1TZXRzIHRoZSBwY3VyIGxhdGNoIG1vZGUg
dG8gQlRSX05PX0xBVENIRVMuICovCi1VTklWX0lOTElORQotdm9pZAotYnRyX3BjdXJfZGV0YWNo
KAotLyo9PT09PT09PT09PT0qLwotCWJ0cl9wY3VyX3QqCXBjdXIpCS8qITwgaW46IHBlcnNpc3Rl
bnQgY3Vyc29yICovCi17Ci0JdXRfYShwY3VyLT5wb3Nfc3RhdGUgPT0gQlRSX1BDVVJfSVNfUE9T
SVRJT05FRCk7Ci0KLQlwY3VyLT5sYXRjaF9tb2RlID0gQlRSX05PX0xBVENIRVM7Ci0KLQlwY3Vy
LT5wb3Nfc3RhdGUgPSBCVFJfUENVUl9XQVNfUE9TSVRJT05FRDsKLX0KLQotLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgot
VGVzdHMgaWYgYSBjdXJzb3IgaXMgZGV0YWNoZWQ6IHRoYXQgaXMgdGhlIGxhdGNoIG1vZGUgaXMg
QlRSX05PX0xBVENIRVMuCi1AcmV0dXJuCVRSVUUgaWYgZGV0YWNoZWQgKi8KLVVOSVZfSU5MSU5F
Ci1pYm9vbAotYnRyX3BjdXJfaXNfZGV0YWNoZWQoCi0vKj09PT09PT09PT09PT09PT09Ki8KLQli
dHJfcGN1cl90KglwY3VyKQkvKiE8IGluOiBwZXJzaXN0ZW50IGN1cnNvciAqLwotewotCWlmIChw
Y3VyLT5sYXRjaF9tb2RlID09IEJUUl9OT19MQVRDSEVTKSB7Ci0KLQkJcmV0dXJuKFRSVUUpOwot
CX0KLQotCXJldHVybihGQUxTRSk7Ci19Ci0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFNldHMgdGhlIG9sZF9yZWNf
YnVmIGZpZWxkIHRvIE5VTEwuICovCiBVTklWX0lOTElORQogdm9pZAoKTm8gYnVuZGxlIChyZWFz
b246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=