From: Luís Soares
Date: October 28 2008 3:34pm
Subject: bzr commit into mysql-5.1 branch (luis.soares:2684) Bug#39325
List-Archive: http://lists.mysql.com/commits/57226
X-Bug: 39325
Message-Id: <200810281534.m9SFYcm0017296@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

I0F0IGZpbGU6Ly8vc3R1ZmYvd29ya3NwYWNlL215c3FsLXNlcnZlci81LjEtcnBsLTM5MzI1LwoK
IDI2ODQgTHXDrXMgU29hcmVzCTIwMDgtMTAtMjgKICAgICAgSW4gcHVyZ2VfZmlyc3RfbG9nOiBm
bHVzaGVzIGZpcnN0IHRoZSByZWxheS1sb2cuaW5mbyBhbmQgb25seSB0aGVuIHB1cmdlcyB0aGUg
bG9ncy4gRml4IEJVRyMzOTMyNS4KbW9kaWZpZWQ6CiAgc3FsL2xvZy5jYwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3NxbC9sb2cuY2MnCi0tLSBhL3NxbC9sb2cuY2MJMjAwOC0xMC0wNiAwODoyNzozNiAr
MDAwMAorKysgYi9zcWwvbG9nLmNjCTIwMDgtMTAtMjggMTU6MzQ6MjkgKzAwMDAKQEAgLTI5MTgs
MTAgKzI5MTgsMTEgQEAgZXJyOgogCiAgIElNUExFTUVOVEFUSU9OCiAgIC0gUHJvdGVjdHMgaW5k
ZXggZmlsZSB3aXRoIExPQ0tfaW5kZXgKKyAgLSBSZWFkIHRoZSBuZXh0IGZpbGUgbmFtZSBmcm9t
IHRoZSBpbmRleCBmaWxlIGFuZCBzdG9yZSBpbiBybGktPmxpbmZvCiAgIC0gRGVsZXRlIHJlbGV2
YW50IHJlbGF5IGxvZyBmaWxlcwogICAtIENvcHkgYWxsIGZpbGUgbmFtZXMgYWZ0ZXIgdGhlc2Ug
b25lcyB0byB0aGUgZnJvbnQgb2YgdGhlIGluZGV4IGZpbGUKICAgLSBJZiB0aGUgT1MgaGFzIHRy
dW5jYXRlLCB0cnVuY2F0ZSB0aGUgZmlsZSwgZWxzZSBmaWxsIGl0IHdpdGggXG4nCi0gIC0gUmVh
ZCB0aGUgbmV4dCBmaWxlIG5hbWUgZnJvbSB0aGUgaW5kZXggZmlsZSBhbmQgc3RvcmUgaW4gcmxp
LT5saW5mbworCiAKICAgQHBhcmFtIHJsaQkgICAgICAgUmVsYXkgbG9nIGluZm9ybWF0aW9uCiAg
IEBwYXJhbSBpbmNsdWRlZCAgICAgSWYgZmFsc2UsIGFsbCByZWxheSBsb2dzIHRoYXQgYXJlIHN0
cmljdGx5IGJlZm9yZQpAQCAtMjk1Miw2ICsyOTUzLDcgQEAgZXJyOgogaW50IE1ZU1FMX0JJTl9M
T0c6OnB1cmdlX2ZpcnN0X2xvZyhSZWxheV9sb2dfaW5mbyogcmxpLCBib29sIGluY2x1ZGVkKQog
ewogICBpbnQgZXJyb3I7CisgIGNoYXIgKnRvX3B1cmdlX2lmX2luY2x1ZGVkID0gTlVMTDsKICAg
REJVR19FTlRFUigicHVyZ2VfZmlyc3RfbG9nIik7CiAKICAgREJVR19BU1NFUlQoaXNfb3Blbigp
KTsKQEAgLTI5NTksMzYgKzI5NjEsMjAgQEAgaW50IE1ZU1FMX0JJTl9MT0c6OnB1cmdlX2ZpcnN0
X2xvZyhSZWxheQogICBEQlVHX0FTU0VSVCghc3RyY21wKHJsaS0+bGluZm8ubG9nX2ZpbGVfbmFt
ZSxybGktPmV2ZW50X3JlbGF5X2xvZ19uYW1lKSk7CiAKICAgcHRocmVhZF9tdXRleF9sb2NrKCZM
T0NLX2luZGV4KTsKLSAgcHRocmVhZF9tdXRleF9sb2NrKCZybGktPmxvZ19zcGFjZV9sb2NrKTsK
LSAgcmxpLT5yZWxheV9sb2cucHVyZ2VfbG9ncyhybGktPmdyb3VwX3JlbGF5X2xvZ19uYW1lLCBp
bmNsdWRlZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAwLCAmcmxpLT5sb2dfc3Bh
Y2VfdG90YWwpOwotICAvLyBUZWxsIHRoZSBJL08gdGhyZWFkIHRvIHRha2UgdGhlIHJlbGF5X2xv
Z19zcGFjZV9saW1pdCBpbnRvIGFjY291bnQKLSAgcmxpLT5pZ25vcmVfbG9nX3NwYWNlX2xpbWl0
PSAwOwotICBwdGhyZWFkX211dGV4X3VubG9jaygmcmxpLT5sb2dfc3BhY2VfbG9jayk7CisgIHRv
X3B1cmdlX2lmX2luY2x1ZGVkID0gbXlfc3RyZHVwKHJsaS0+Z3JvdXBfcmVsYXlfbG9nX25hbWUs
IE1ZRigwKSk7CiAKICAgLyoKLSAgICBPayB0byBicm9hZGNhc3QgYWZ0ZXIgdGhlIGNyaXRpY2Fs
IHJlZ2lvbiBhcyB0aGVyZSBpcyBubyByaXNrIG9mCi0gICAgdGhlIG11dGV4IGJlaW5nIGRlc3Ry
b3llZCBieSB0aGlzIHRocmVhZCBsYXRlciAtIHRoaXMgaGVscHMgc2F2ZQotICAgIGNvbnRleHQg
c3dpdGNoZXMKLSAgKi8KLSAgcHRocmVhZF9jb25kX2Jyb2FkY2FzdCgmcmxpLT5sb2dfc3BhY2Vf
Y29uZCk7Ci0gIAotICAvKgogICAgIFJlYWQgdGhlIG5leHQgbG9nIGZpbGUgbmFtZSBmcm9tIHRo
ZSBpbmRleCBmaWxlIGFuZCBwYXNzIGl0IGJhY2sgdG8KLSAgICB0aGUgY2FsbGVyCi0gICAgSWYg
aW5jbHVkZWQgaXMgdHJ1ZSwgd2Ugd2FudCB0aGUgZmlyc3QgcmVsYXkgbG9nOwotICAgIG90aGVy
d2lzZSB3ZSB3YW50IHRoZSBvbmUgYWZ0ZXIgZXZlbnRfcmVsYXlfbG9nX25hbWUuCi0gICovCi0g
IGlmICgoaW5jbHVkZWQgJiYgKGVycm9yPWZpbmRfbG9nX3BvcygmcmxpLT5saW5mbywgTnVsbFMs
IDApKSkgfHwKLSAgICAgICghaW5jbHVkZWQgJiYKLSAgICAgICAoKGVycm9yPWZpbmRfbG9nX3Bv
cygmcmxpLT5saW5mbywgcmxpLT5ldmVudF9yZWxheV9sb2dfbmFtZSwgMCkpIHx8Ci0gICAgICAg
IChlcnJvcj1maW5kX25leHRfbG9nKCZybGktPmxpbmZvLCAwKSkpKSkKKyAgICB0aGUgY2FsbGVy
LgorICAqLworICBpZigoZXJyb3I9ZmluZF9sb2dfcG9zKCZybGktPmxpbmZvLCBybGktPmV2ZW50
X3JlbGF5X2xvZ19uYW1lLCAwKSkgfHwgCisgICAgIChlcnJvcj1maW5kX25leHRfbG9nKCZybGkt
PmxpbmZvLCAwKSkpCiAgIHsKICAgICBjaGFyIGJ1ZmZbMjJdOwogICAgIHNxbF9wcmludF9lcnJv
cigibmV4dCBsb2cgZXJyb3I6ICVkICBvZmZzZXQ6ICVzICBsb2c6ICVzIGluY2x1ZGVkOiAlZCIs
CiAgICAgICAgICAgICAgICAgICAgIGVycm9yLAogICAgICAgICAgICAgICAgICAgICBsbHN0cihy
bGktPmxpbmZvLmluZGV4X2ZpbGVfb2Zmc2V0LGJ1ZmYpLAotICAgICAgICAgICAgICAgICAgICBy
bGktPmdyb3VwX3JlbGF5X2xvZ19uYW1lLAorICAgICAgICAgICAgICAgICAgICBybGktPmV2ZW50
X3JlbGF5X2xvZ19uYW1lLAogICAgICAgICAgICAgICAgICAgICBpbmNsdWRlZCk7CiAgICAgZ290
byBlcnI7CiAgIH0KQEAgLTMwMTMsMTAgKzI5OTksNDggQEAgaW50IE1ZU1FMX0JJTl9MT0c6OnB1
cmdlX2ZpcnN0X2xvZyhSZWxheQogICAgIHJsaS0+bm90aWZ5X2dyb3VwX3JlbGF5X2xvZ19uYW1l
X3VwZGF0ZSgpOwogICB9CiAKKyAgREJVR19FWEVDVVRFX0lGKCJjcmFzaF9iZWZvcmVfZmx1c2hf
cmVsYXlfbG9nX2luZm8iLCBhYm9ydCgpOyk7CisKICAgLyogU3RvcmUgd2hlcmUgd2UgYXJlIGlu
IHRoZSBuZXcgZmlsZSBmb3IgdGhlIGV4ZWN1dGlvbiB0aHJlYWQgKi8KICAgZmx1c2hfcmVsYXlf
bG9nX2luZm8ocmxpKTsKIAorICBEQlVHX0VYRUNVVEVfSUYoImNyYXNoX2JlZm9yZV9wdXJnZV9s
b2dzIiwgYWJvcnQoKTspOworCisgIHB0aHJlYWRfbXV0ZXhfbG9jaygmcmxpLT5sb2dfc3BhY2Vf
bG9jayk7CisgIHJsaS0+cmVsYXlfbG9nLnB1cmdlX2xvZ3ModG9fcHVyZ2VfaWZfaW5jbHVkZWQs
IGluY2x1ZGVkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsIDAsICZybGktPmxvZ19z
cGFjZV90b3RhbCk7CisgIC8vIFRlbGwgdGhlIEkvTyB0aHJlYWQgdG8gdGFrZSB0aGUgcmVsYXlf
bG9nX3NwYWNlX2xpbWl0IGludG8gYWNjb3VudAorICBybGktPmlnbm9yZV9sb2dfc3BhY2VfbGlt
aXQ9IDA7CisgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZybGktPmxvZ19zcGFjZV9sb2NrKTsKKwor
ICAvKgorICAgIE9rIHRvIGJyb2FkY2FzdCBhZnRlciB0aGUgY3JpdGljYWwgcmVnaW9uIGFzIHRo
ZXJlIGlzIG5vIHJpc2sgb2YKKyAgICB0aGUgbXV0ZXggYmVpbmcgZGVzdHJveWVkIGJ5IHRoaXMg
dGhyZWFkIGxhdGVyIC0gdGhpcyBoZWxwcyBzYXZlCisgICAgY29udGV4dCBzd2l0Y2hlcworICAq
LworICBwdGhyZWFkX2NvbmRfYnJvYWRjYXN0KCZybGktPmxvZ19zcGFjZV9jb25kKTsKKworICAv
KgorICAgKiBOZWVkIHRvIHVwZGF0ZSB0aGUgbG9nIHBvcyBiZWNhdXNlIHB1cmdlIGxvZ3MgaGFz
IGJlZW4gY2FsbGVkIAorICAgKiBhZnRlciBmZXRjaGluZyBpbml0aWFsbHkgdGhlIGxvZyBwb3Mg
YXQgdGhlIGJlZ2luaW5nIG9mIHRoZSBtZXRob2QuCisgICAqLworICBpZihlcnJvcj1maW5kX2xv
Z19wb3MoJnJsaS0+bGluZm8sIHJsaS0+ZXZlbnRfcmVsYXlfbG9nX25hbWUsIDApKQorICB7Cisg
ICAgY2hhciBidWZmWzIyXTsKKyAgICBzcWxfcHJpbnRfZXJyb3IoIm5leHQgbG9nIGVycm9yOiAl
ZCAgb2Zmc2V0OiAlcyAgbG9nOiAlcyBpbmNsdWRlZDogJWQiLAorICAgICAgICAgICAgICAgICAg
ICBlcnJvciwKKyAgICAgICAgICAgICAgICAgICAgbGxzdHIocmxpLT5saW5mby5pbmRleF9maWxl
X29mZnNldCxidWZmKSwKKyAgICAgICAgICAgICAgICAgICAgcmxpLT5ncm91cF9yZWxheV9sb2df
bmFtZSwKKyAgICAgICAgICAgICAgICAgICAgaW5jbHVkZWQpOworICAgIGdvdG8gZXJyOworICB9
CisKKyAgLyogSWYgaW5jbHVkZWQgd2FzIHBhc3NlZCwgcmxpLT5saW5mbyBzaG91bGQgYmUgdGhl
IGZpcnN0IGVudHJ5LiAqLworICBEQlVHX0FTU0VSVCghaW5jbHVkZWQgfHwgcmxpLT5saW5mby5p
bmRleF9maWxlX3N0YXJ0X29mZnNldCA9PSAwKTsKKworCiBlcnI6CisgIG15X2ZyZWUodG9fcHVy
Z2VfaWZfaW5jbHVkZWQsIE1ZRigwKSk7CiAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZMT0NLX2lu
ZGV4KTsKICAgREJVR19SRVRVUk4oZXJyb3IpOwogfQoK