From: marko.makela
Date: June 14 2012 8:13pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3979 to 3980) WL#6255
List-Archive: http://lists.mysql.com/commits/144241
Message-Id: <20120614201338.7195.68718.3980@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5ODAgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xNAogICAgICBXTCM2MjU1IHJiOjExMDUgUHJv
YmxlbSAxOCB1dF9hKHByZWJ1aWx0LT50YWJsZS0+bl9yZWZfY291bnQgPT0gMSkKICAgICAgCiAg
ICAgIHJvd19wdXJnZV9yZWNvcmRfZnVuYygpOiBFdmVuIGlmIHRoZSByZWNvcmQgY2Fubm90IGJl
IHB1cmdlZCwKICAgICAgY2xvc2UgdGhlIHRhYmxlIGhhbmRsZS4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmNjCiAzOTc5IE1hcmtvIE3DpGtlbMOk
CTIwMTItMDYtMTQKICAgICAgV0wjNjI1NSBjbGVhbnVwOiBSZW1vdmUgZGljdF90YWJsZV9pc19v
bmxpbmVfcmVidWlsZCgpLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvZGljdDBkaWN0LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGlj
dC5pYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuY2MKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MHB1cmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTIwNjE0MDgwOTA2LW8zN2Ntbmk0djIzbXAwNXkKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHB1cmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjE0MjAxMjM1
LWF2YTRoaGJ3b3ZuaHJueDcKQEAgLTgxNyw2ICs4MTcsNyBAQCByb3dfcHVyZ2VfcmVjb3JkX2Z1
bmMoCiAJCQkJCXdlcmUgdXBkYXRlZCAqLwogewogCWRpY3RfaW5kZXhfdCoJY2x1c3RfaW5kZXg7
CisJYm9vbAkJcHVyZ2VkCQk9IHRydWU7CiAKIAljbHVzdF9pbmRleCA9IGRpY3RfdGFibGVfZ2V0
X2ZpcnN0X2luZGV4KG5vZGUtPnRhYmxlKTsKIApAQCAtODM0LDcgKzgzNSw4IEBAIHJvd19wdXJn
ZV9yZWNvcmRfZnVuYygKIAkJLyogZmFsbCB0aHJvdWdoICovCiAJY2FzZSBUUlhfVU5ET19VUERf
RVhJU1RfUkVDOgogCQlpZiAoIXJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuKHRociwgbm9k
ZSwgdW5kb19yZWMpKSB7Ci0JCQlyZXR1cm4oZmFsc2UpOworCQkJcHVyZ2VkID0gZmFsc2U7CisJ
CQlicmVhazsKIAkJfQogCQlNT05JVE9SX0lOQyhNT05JVE9SX05fVVBEX0VYSVNUX0VYVEVSTik7
CiAJCWJyZWFrOwpAQCAtODQ5LDcgKzg1MSw3IEBAIHJvd19wdXJnZV9yZWNvcmRfZnVuYygKIAkJ
bm9kZS0+dGFibGUgPSBOVUxMOwogCX0KIAotCXJldHVybih0cnVlKTsKKwlyZXR1cm4ocHVyZ2Vk
KTsKIH0KIAogI2lmZGVmIFVOSVZfREVCVUcKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku