From: marko.makela
Date: August 9 2012 8:05am
Subject: bzr push into mysql-5.1 branch (marko.makela:3791)
List-Archive: http://lists.mysql.com/commits/144537
Message-Id: <20120809080558.5711.96924.3791@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM3OTEgTWFya28gTcOka2Vsw6QJMjAxMi0wOC0wOSBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20g
bXlzcWwtNS4xIHRvIHdvcmtpbmcgY29weS4KCiAgICBtb2RpZmllZDoKICAgICAgbGlibXlzcWxk
L2xpYl9zcWwuY2MKICAgICAgc3FsL3NxbF9jbGFzcy5oCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2J0ci9idHIwcGN1ci5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9i
dHIwcGN1ci5jCXJldmlkOnN1bmFuZGEubWVub25Ab3JhY2xlLmNvbS0yMDEyMDgwOTA2NTA0My1v
MDEzYWs2MHJlNjJsdXM0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBwY3VyLmMJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA4MDkwNzQ4MjUtbWNpMmE5eHltMmxwaTQz
MQpAQCAtMzEyLDQ1ICszMTIsNDAgQEAgYnRyX3BjdXJfcmVzdG9yZV9wb3NpdGlvbigKIAkvKiBS
ZXN0b3JlIHRoZSBvbGQgc2VhcmNoIG1vZGUgKi8KIAljdXJzb3ItPnNlYXJjaF9tb2RlID0gb2xk
X21vZGU7CiAKLQlpZiAoYnRyX3BjdXJfaXNfb25fdXNlcl9yZWMoY3Vyc29yLCBtdHIpKSB7Ci0J
CXN3aXRjaCAoY3Vyc29yLT5yZWxfcG9zKSB7Ci0JCWNhc2UgQlRSX1BDVVJfT046Ci0JCQlpZiAo
IWNtcF9kdHVwbGVfcmVjKAotCQkJCSAgICB0dXBsZSwgYnRyX3BjdXJfZ2V0X3JlYyhjdXJzb3Ip
LAotCQkJCSAgICByZWNfZ2V0X29mZnNldHMoYnRyX3BjdXJfZ2V0X3JlYyhjdXJzb3IpLAotCQkJ
CQkJICAgIGluZGV4LCBOVUxMLAotCQkJCQkJICAgIFVMSU5UX1VOREVGSU5FRCwgJmhlYXApKSkg
ewotCi0JCQkJLyogV2UgaGF2ZSB0byBzdG9yZSB0aGUgTkVXIHZhbHVlIGZvcgotCQkJCXRoZSBt
b2RpZnkgY2xvY2ssIHNpbmNlIHRoZSBjdXJzb3IgY2FuCi0JCQkJbm93IGJlIG9uIGEgZGlmZmVy
ZW50IHBhZ2UhIEJ1dCB3ZSBjYW4KLQkJCQlyZXRhaW4gdGhlIHZhbHVlIG9mIG9sZF9yZWMgKi8K
LQotCQkJCWN1cnNvci0+YmxvY2tfd2hlbl9zdG9yZWQgPQotCQkJCQlidWZfYmxvY2tfYWxpZ24o
Ci0JCQkJCQlidHJfcGN1cl9nZXRfcGFnZShjdXJzb3IpKTsKLQkJCQljdXJzb3ItPm1vZGlmeV9j
bG9jayA9Ci0JCQkJCWJ1Zl9ibG9ja19nZXRfbW9kaWZ5X2Nsb2NrKAotCQkJCQkJY3Vyc29yLT5i
bG9ja193aGVuX3N0b3JlZCk7Ci0JCQkJY3Vyc29yLT5vbGRfc3RvcmVkID0gQlRSX1BDVVJfT0xE
X1NUT1JFRDsKLQotCQkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7Ci0KLQkJCQlyZXR1cm4oVFJVRSk7
Ci0JCQl9Ci0KLQkJCWJyZWFrOwotCQljYXNlIEJUUl9QQ1VSX0JFRk9SRToKLQkJCXBhZ2VfY3Vy
X21vdmVfdG9fbmV4dChidHJfcGN1cl9nZXRfcGFnZV9jdXIoY3Vyc29yKSk7Ci0JCQlicmVhazsK
LQkJY2FzZSBCVFJfUENVUl9BRlRFUjoKLQkJCXBhZ2VfY3VyX21vdmVfdG9fcHJldihidHJfcGN1
cl9nZXRfcGFnZV9jdXIoY3Vyc29yKSk7Ci0JCQlicmVhazsKKwlzd2l0Y2ggKGN1cnNvci0+cmVs
X3BvcykgeworCWNhc2UgQlRSX1BDVVJfT046CisJCWlmIChidHJfcGN1cl9pc19vbl91c2VyX3Jl
YyhjdXJzb3IsIG10cikKKwkJICAgICYmICFjbXBfZHR1cGxlX3JlYygKKwkJCSAgICB0dXBsZSwg
YnRyX3BjdXJfZ2V0X3JlYyhjdXJzb3IpLAorCQkJICAgIHJlY19nZXRfb2Zmc2V0cyhidHJfcGN1
cl9nZXRfcmVjKGN1cnNvciksCisJCQkJCSAgICBpbmRleCwgTlVMTCwKKwkJCQkJICAgIFVMSU5U
X1VOREVGSU5FRCwgJmhlYXApKSkgeworCisJCQkvKiBXZSBoYXZlIHRvIHN0b3JlIHRoZSBORVcg
dmFsdWUgZm9yCisJCQl0aGUgbW9kaWZ5IGNsb2NrLCBzaW5jZSB0aGUgY3Vyc29yIGNhbgorCQkJ
bm93IGJlIG9uIGEgZGlmZmVyZW50IHBhZ2UhIEJ1dCB3ZSBjYW4KKwkJCXJldGFpbiB0aGUgdmFs
dWUgb2Ygb2xkX3JlYyAqLworCisJCQljdXJzb3ItPmJsb2NrX3doZW5fc3RvcmVkID0KKwkJCQli
dWZfYmxvY2tfYWxpZ24oCisJCQkJCWJ0cl9wY3VyX2dldF9wYWdlKGN1cnNvcikpOworCQkJY3Vy
c29yLT5tb2RpZnlfY2xvY2sgPQorCQkJCWJ1Zl9ibG9ja19nZXRfbW9kaWZ5X2Nsb2NrKAorCQkJ
CQljdXJzb3ItPmJsb2NrX3doZW5fc3RvcmVkKTsKKwkJCWN1cnNvci0+b2xkX3N0b3JlZCA9IEJU
Ul9QQ1VSX09MRF9TVE9SRUQ7CisKKwkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CisKKwkJCXJldHVy
bihUUlVFKTsKKwkJfQogI2lmZGVmIFVOSVZfREVCVUcKLQkJZGVmYXVsdDoKLQkJCXV0X2Vycm9y
OworCQkvKiBmYWxsIHRocm91Z2ggKi8KKwljYXNlIEJUUl9QQ1VSX0JFRk9SRToKKwljYXNlIEJU
Ul9QQ1VSX0FGVEVSOgorCQlicmVhazsKKwlkZWZhdWx0OgorCQl1dF9lcnJvcjsKICNlbmRpZiAv
KiBVTklWX0RFQlVHICovCi0JCX0KIAl9CiAKIAltZW1faGVhcF9mcmVlKGhlYXApOwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJcmV2aWQ6c3VuYW5kYS5tZW5vbkBvcmFjbGUuY29t
LTIwMTIwODA5MDY1MDQzLW8wMTNhazYwcmU2Mmx1czQKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL0NoYW5nZUxvZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDgwOTA3NDgy
NS1tY2kyYTl4eW0ybHBpNDMxCkBAIC0xLDMgKzEsOSBAQAorMjAxMi0wOC0wNwlUaGUgSW5ub0RC
IFRlYW0KKworCSogYnRyL2J0cjBwY3VyLmMsIHJvdy9yb3cwbWVyZ2UuYzoKKwlGaXggQnVnIzE0
Mzk5MTQ4IElOTk9EQiBUQUJMRVMgVU5ERVIgTE9BRCBQUk9EVUNFIERVUExJQ0FURSBDT1BJRVMK
KwlPRiBST1dTIElOIFFVRVJJRVMKKwogMjAxMi0wMy0xNQlUaGUgSW5ub0RCIFRlYW0KIAogCSog
ZmlsL2ZpbDBmaWwuYywgaWJ1Zi9pYnVmMGlidWYuYywgaW5jbHVkZS9maWwwZmlsLmgsCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwcGN1ci5jJwotLS0g
YS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0cjBwY3VyLmMJcmV2aWQ6c3VuYW5kYS5tZW5v
bkBvcmFjbGUuY29tLTIwMTIwODA5MDY1MDQzLW8wMTNhazYwcmU2Mmx1czQKKysrIGIvc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwcGN1ci5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTIwODA5MDc0ODI1LW1jaTJhOXh5bTJscGk0MzEKQEAgLTMzNiw0NCArMzM2LDM5IEBA
IGJ0cl9wY3VyX3Jlc3RvcmVfcG9zaXRpb25fZnVuYygKIAkvKiBSZXN0b3JlIHRoZSBvbGQgc2Vh
cmNoIG1vZGUgKi8KIAljdXJzb3ItPnNlYXJjaF9tb2RlID0gb2xkX21vZGU7CiAKLQlpZiAoYnRy
X3BjdXJfaXNfb25fdXNlcl9yZWMoY3Vyc29yKSkgewotCQlzd2l0Y2ggKGN1cnNvci0+cmVsX3Bv
cykgewotCQljYXNlIEJUUl9QQ1VSX09OOgotCQkJaWYgKCFjbXBfZHR1cGxlX3JlYygKLQkJCQkg
ICAgdHVwbGUsIGJ0cl9wY3VyX2dldF9yZWMoY3Vyc29yKSwKLQkJCQkgICAgcmVjX2dldF9vZmZz
ZXRzKGJ0cl9wY3VyX2dldF9yZWMoY3Vyc29yKSwKLQkJCQkJCSAgICBpbmRleCwgTlVMTCwKLQkJ
CQkJCSAgICBVTElOVF9VTkRFRklORUQsICZoZWFwKSkpIHsKLQotCQkJCS8qIFdlIGhhdmUgdG8g
c3RvcmUgdGhlIE5FVyB2YWx1ZSBmb3IKLQkJCQl0aGUgbW9kaWZ5IGNsb2NrLCBzaW5jZSB0aGUg
Y3Vyc29yIGNhbgotCQkJCW5vdyBiZSBvbiBhIGRpZmZlcmVudCBwYWdlISBCdXQgd2UgY2FuCi0J
CQkJcmV0YWluIHRoZSB2YWx1ZSBvZiBvbGRfcmVjICovCi0KLQkJCQljdXJzb3ItPmJsb2NrX3do
ZW5fc3RvcmVkID0KLQkJCQkJYnRyX3BjdXJfZ2V0X2Jsb2NrKGN1cnNvcik7Ci0JCQkJY3Vyc29y
LT5tb2RpZnlfY2xvY2sgPQotCQkJCQlidWZfYmxvY2tfZ2V0X21vZGlmeV9jbG9jaygKLQkJCQkJ
CWN1cnNvci0+YmxvY2tfd2hlbl9zdG9yZWQpOwotCQkJCWN1cnNvci0+b2xkX3N0b3JlZCA9IEJU
Ul9QQ1VSX09MRF9TVE9SRUQ7Ci0KLQkJCQltZW1faGVhcF9mcmVlKGhlYXApOwotCi0JCQkJcmV0
dXJuKFRSVUUpOwotCQkJfQotCi0JCQlicmVhazsKLQkJY2FzZSBCVFJfUENVUl9CRUZPUkU6Ci0J
CQlwYWdlX2N1cl9tb3ZlX3RvX25leHQoYnRyX3BjdXJfZ2V0X3BhZ2VfY3VyKGN1cnNvcikpOwot
CQkJYnJlYWs7Ci0JCWNhc2UgQlRSX1BDVVJfQUZURVI6Ci0JCQlwYWdlX2N1cl9tb3ZlX3RvX3By
ZXYoYnRyX3BjdXJfZ2V0X3BhZ2VfY3VyKGN1cnNvcikpOwotCQkJYnJlYWs7CisJc3dpdGNoIChj
dXJzb3ItPnJlbF9wb3MpIHsKKwljYXNlIEJUUl9QQ1VSX09OOgorCQlpZiAoYnRyX3BjdXJfaXNf
b25fdXNlcl9yZWMoY3Vyc29yKQorCQkgICAgJiYgIWNtcF9kdHVwbGVfcmVjKAorCQkJICAgIHR1
cGxlLCBidHJfcGN1cl9nZXRfcmVjKGN1cnNvciksCisJCQkgICAgcmVjX2dldF9vZmZzZXRzKGJ0
cl9wY3VyX2dldF9yZWMoY3Vyc29yKSwKKwkJCQkJICAgIGluZGV4LCBOVUxMLAorCQkJCQkgICAg
VUxJTlRfVU5ERUZJTkVELCAmaGVhcCkpKSB7CisKKwkJCS8qIFdlIGhhdmUgdG8gc3RvcmUgdGhl
IE5FVyB2YWx1ZSBmb3IKKwkJCXRoZSBtb2RpZnkgY2xvY2ssIHNpbmNlIHRoZSBjdXJzb3IgY2Fu
CisJCQlub3cgYmUgb24gYSBkaWZmZXJlbnQgcGFnZSEgQnV0IHdlIGNhbgorCQkJcmV0YWluIHRo
ZSB2YWx1ZSBvZiBvbGRfcmVjICovCisKKwkJCWN1cnNvci0+YmxvY2tfd2hlbl9zdG9yZWQgPQor
CQkJCWJ0cl9wY3VyX2dldF9ibG9jayhjdXJzb3IpOworCQkJY3Vyc29yLT5tb2RpZnlfY2xvY2sg
PQorCQkJCWJ1Zl9ibG9ja19nZXRfbW9kaWZ5X2Nsb2NrKAorCQkJCQljdXJzb3ItPmJsb2NrX3do
ZW5fc3RvcmVkKTsKKwkJCWN1cnNvci0+b2xkX3N0b3JlZCA9IEJUUl9QQ1VSX09MRF9TVE9SRUQ7
CisKKwkJCW1lbV9oZWFwX2ZyZWUoaGVhcCk7CisKKwkJCXJldHVybihUUlVFKTsKKwkJfQogI2lm
ZGVmIFVOSVZfREVCVUcKLQkJZGVmYXVsdDoKLQkJCXV0X2Vycm9yOworCQkvKiBmYWxsIHRocm91
Z2ggKi8KKwljYXNlIEJUUl9QQ1VSX0JFRk9SRToKKwljYXNlIEJUUl9QQ1VSX0FGVEVSOgorCQli
cmVhazsKKwlkZWZhdWx0OgorCQl1dF9lcnJvcjsKICNlbmRpZiAvKiBVTklWX0RFQlVHICovCi0J
CX0KIAl9CiAKIAltZW1faGVhcF9mcmVlKGhlYXApOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9yb3cvcm93MG1lcmdlLmMJcmV2aWQ6c3VuYW5kYS5tZW5vbkBvcmFjbGUuY29tLTIwMTIw
ODA5MDY1MDQzLW8wMTNhazYwcmU2Mmx1czQKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jv
dy9yb3cwbWVyZ2UuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDgwOTA3NDgy
NS1tY2kyYTl4eW0ybHBpNDMxCkBAIC0xMjE0LDExICsxMjE0LDI1IEBAIHJvd19tZXJnZV9yZWFk
X2NsdXN0ZXJlZF9pbmRleCgKIAkJCQlnb3RvIGVycl9leGl0OwogCQkJfQogCisJCQkvKiBTdG9y
ZSB0aGUgY3Vyc29yIHBvc2l0aW9uIG9uIHRoZSBsYXN0IHVzZXIKKwkJCXJlY29yZCBvbiB0aGUg
cGFnZS4gKi8KKwkJCWJ0cl9wY3VyX21vdmVfdG9fcHJldl9vbl9wYWdlKCZwY3VyKTsKKwkJCS8q
IExlYWYgcGFnZXMgbXVzdCBuZXZlciBiZSBlbXB0eSwgdW5sZXNzCisJCQl0aGlzIGlzIHRoZSBv
bmx5IHBhZ2UgaW4gdGhlIGluZGV4IHRyZWUuICovCisJCQl1dF9hZChidHJfcGN1cl9pc19vbl91
c2VyX3JlYygmcGN1cikKKwkJCSAgICAgIHx8IGJ1Zl9ibG9ja19nZXRfcGFnZV9ubygKKwkJCQkg
ICAgICBidHJfcGN1cl9nZXRfYmxvY2soJnBjdXIpKQorCQkJICAgICAgPT0gY2x1c3RfaW5kZXgt
PnBhZ2UpOworCiAJCQlidHJfcGN1cl9zdG9yZV9wb3NpdGlvbigmcGN1ciwgJm10cik7CiAJCQlt
dHJfY29tbWl0KCZtdHIpOwogCQkJbXRyX3N0YXJ0KCZtdHIpOworCQkJLyogUmVzdG9yZSBwb3Np
dGlvbiBvbiB0aGUgcmVjb3JkLCBvciBpdHMKKwkJCXByZWRlY2Vzc29yIGlmIHRoZSByZWNvcmQg
d2FzIHB1cmdlZAorCQkJbWVhbndoaWxlLiAqLwogCQkJYnRyX3BjdXJfcmVzdG9yZV9wb3NpdGlv
bihCVFJfU0VBUkNIX0xFQUYsCiAJCQkJCQkgICZwY3VyLCAmbXRyKTsKKwkJCS8qIE1vdmUgdG8g
dGhlIHN1Y2Nlc3NvciBvZiB0aGUgb3JpZ2luYWwgcmVjb3JkLiAqLwogCQkJaGFzX25leHQgPSBi
dHJfcGN1cl9tb3ZlX3RvX25leHRfdXNlcl9yZWMoJnBjdXIsICZtdHIpOwogCQl9CiAKCk5vIGJ1
bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku