From: marko.makela
Date: August 17 2012 1:08pm
Subject: bzr push into mysql-trunk branch (marko.makela:4247 to 4248)
List-Archive: http://lists.mysql.com/commits/144568
Message-Id: <20120817130816.18890.78221.4248@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQyNDggTWFya28gTcOka2Vsw6QJMjAxMi0wOC0xNyBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MGxvZy5jYwogNDI0NyBUb3IgRGlkcmlrc2VuCTIwMTItMDgtMTcKICAgICAgRml4
IGJyb2tlbiBidWlsZCBmb3IgLURXSVRIT1VUX1BFUkZTQ0hFTUFfU1RPUkFHRV9FTkdJTkU9MQoK
ICAgIG1vZGlmaWVkOgogICAgICBzcWwvcnBsX2luZm9fZmFjdG9yeS5jYwogICAgICBzcWwvcnBs
X21pLmNjCiAgICAgIHNxbC9ycGxfbWkuaAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MGxvZy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5j
YwlyZXZpZDp0b3IuZGlkcmlrc2VuQG9yYWNsZS5jb20tMjAxMjA4MTcxMjI5MjYtbm55dzExZzNp
N3p6MmEybQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwODE3MTMwNzIwLWluYWNjb3JwYTFvemh4M3QKQEAgLTQ5
NCw3ICs0OTQsNyBAQCByb3dfbG9nX3RhYmxlX2RlbGV0ZSgKIAlpZiAoYnl0ZSogYiA9IHJvd19s
b2dfdGFibGVfb3BlbihpbmRleC0+b25saW5lX2xvZywKIAkJCQkJIG1yZWNfc2l6ZSwgJmF2YWls
X3NpemUpKSB7CiAJCSpiKysgPSBST1dfVF9ERUxFVEU7Ci0JCSpiKysgPSBvbGRfcGtfZXh0cmFf
c2l6ZTsKKwkJKmIrKyA9IHN0YXRpY19jYXN0PGJ5dGU+KG9sZF9wa19leHRyYV9zaXplKTsKIAog
CQlyZWNfY29udmVydF9kdHVwbGVfdG9fcmVjX2NvbXAoCiAJCQliICsgb2xkX3BrX2V4dHJhX3Np
emUsIDAsIG5ld19pbmRleCwKQEAgLTYwOSw3ICs2MDksNyBAQCByb3dfbG9nX3RhYmxlX2xvd19y
ZWR1bmRhbnQoCiAJCSpiKysgPSBpbnNlcnQgPyBST1dfVF9JTlNFUlQgOiBST1dfVF9VUERBVEU7
CiAKIAkJaWYgKG9sZF9wa19zaXplKSB7Ci0JCQkqYisrID0gb2xkX3BrX2V4dHJhX3NpemU7CisJ
CQkqYisrID0gc3RhdGljX2Nhc3Q8Ynl0ZT4ob2xkX3BrX2V4dHJhX3NpemUpOwogCiAJCQlyZWNf
Y29udmVydF9kdHVwbGVfdG9fcmVjX2NvbXAoCiAJCQkJYiArIG9sZF9wa19leHRyYV9zaXplLCAw
LCBuZXdfaW5kZXgsCkBAIC02MTksMTEgKzYxOSwxMSBAQCByb3dfbG9nX3RhYmxlX2xvd19yZWR1
bmRhbnQoCiAJCX0KIAogCQlpZiAoZXh0cmFfc2l6ZSA8IDB4ODApIHsKLQkJCSpiKysgPSAoYnl0
ZSkgZXh0cmFfc2l6ZTsKKwkJCSpiKysgPSBzdGF0aWNfY2FzdDxieXRlPihleHRyYV9zaXplKTsK
IAkJfSBlbHNlIHsKIAkJCXV0X2FkKGV4dHJhX3NpemUgPCAweDgwMDApOwotCQkJKmIrKyA9IChi
eXRlKSAoMHg4MCB8IChleHRyYV9zaXplID4+IDgpKTsKLQkJCSpiKysgPSAoYnl0ZSkgZXh0cmFf
c2l6ZTsKKwkJCSpiKysgPSBzdGF0aWNfY2FzdDxieXRlPigweDgwIHwgKGV4dHJhX3NpemUgPj4g
OCkpOworCQkJKmIrKyA9IHN0YXRpY19jYXN0PGJ5dGU+KGV4dHJhX3NpemUpOwogCQl9CiAKIAkJ
cmVjX2NvbnZlcnRfZHR1cGxlX3RvX3JlY19jb21wKApAQCAtNzIyLDcgKzcyMiw3IEBAIHJvd19s
b2dfdGFibGVfbG93KAogCQkqYisrID0gaW5zZXJ0ID8gUk9XX1RfSU5TRVJUIDogUk9XX1RfVVBE
QVRFOwogCiAJCWlmIChvbGRfcGtfc2l6ZSkgewotCQkJKmIrKyA9IG9sZF9wa19leHRyYV9zaXpl
OworCQkJKmIrKyA9IHN0YXRpY19jYXN0PGJ5dGU+KG9sZF9wa19leHRyYV9zaXplKTsKIAogCQkJ
cmVjX2NvbnZlcnRfZHR1cGxlX3RvX3JlY19jb21wKAogCQkJCWIgKyBvbGRfcGtfZXh0cmFfc2l6
ZSwgMCwgbmV3X2luZGV4LApAQCAtNzMyLDExICs3MzIsMTEgQEAgcm93X2xvZ190YWJsZV9sb3co
CiAJCX0KIAogCQlpZiAoZXh0cmFfc2l6ZSA8IDB4ODApIHsKLQkJCSpiKysgPSAoYnl0ZSkgZXh0
cmFfc2l6ZTsKKwkJCSpiKysgPSBzdGF0aWNfY2FzdDxieXRlPihleHRyYV9zaXplKTsKIAkJfSBl
bHNlIHsKIAkJCXV0X2FkKGV4dHJhX3NpemUgPCAweDgwMDApOwotCQkJKmIrKyA9IChieXRlKSAo
MHg4MCB8IChleHRyYV9zaXplID4+IDgpKTsKLQkJCSpiKysgPSAoYnl0ZSkgZXh0cmFfc2l6ZTsK
KwkJCSpiKysgPSBzdGF0aWNfY2FzdDxieXRlPigweDgwIHwgKGV4dHJhX3NpemUgPj4gOCkpOwor
CQkJKmIrKyA9IHN0YXRpY19jYXN0PGJ5dGU+KGV4dHJhX3NpemUpOwogCQl9CiAKIAkJbWVtY3B5
KGIsIHJlYyAtIHJlY19vZmZzX2V4dHJhX3NpemUob2Zmc2V0cyksIGV4dHJhX3NpemUpOwoKTm8g
YnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=