From: marko.makela
Date: May 23 2012 8:09pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3858 to 3859)
List-Archive: http://lists.mysql.com/commits/143945
Message-Id: <201205232009.q4NK9Pag029871@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NTkgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yMwogICAgICByb3dfcmVjX3RvX2luZGV4X2Vu
dHJ5KCk6IE1ha2Ugb2Zmc2V0cyBjb25zdCwKICAgICAgd2hpY2ggaXQgaXMgZXhjZXB0IGluIGRl
YnVnIGJ1aWxkcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L3JvdzByb3cuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmNjCiAzODU4IE1h
cmtvIE3DpGtlbMOkCTIwMTItMDUtMjMKICAgICAgU2ltcGxpZnkgcmVjX29mZnNfbWFrZV92YWxp
ZCgpIGNhbGxzLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2FwaS9hcGkw
YXBpLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBjdXIuY2MKICAgICAgc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3JvdzByb3cuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3Jv
dzByb3cuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyMzE5NTUzMi1pMTNq
angycnh0NDN4dW01CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwcm93LmgJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjMyMDA4MjUtMWIyNHdib3htZTc3ZjBn
egpAQCAtMTg5LDcgKzE4OSw3IEBAIHJvd19yZWNfdG9faW5kZXhfZW50cnkoCiAJCQkJCXMtbGF0
Y2hlZCBhbmQgdGhlIGxhdGNoIGhlbGQKIAkJCQkJYXMgbG9uZyBhcyB0aGUgZHR1cGxlIGlzIHVz
ZWQhICovCiAJY29uc3QgZGljdF9pbmRleF90KglpbmRleCwJLyohPCBpbjogaW5kZXggKi8KLQl1
bGludCoJCQlvZmZzZXRzLC8qITwgaW4vb3V0OiByZWNfZ2V0X29mZnNldHMocmVjKSAqLworCWNv
bnN0IHVsaW50KgkJb2Zmc2V0cywvKiE8IGluL291dDogcmVjX2dldF9vZmZzZXRzKHJlYykgKi8K
IAl1bGludCoJCQluX2V4dCwJLyohPCBvdXQ6IG51bWJlciBvZiBleHRlcm5hbGx5CiAJCQkJCXN0
b3JlZCBjb2x1bW5zICovCiAJbWVtX2hlYXBfdCoJCWhlYXApCS8qITwgaW46IG1lbW9yeSBoZWFw
IGZyb20gd2hpY2gKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
cm93LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmNjCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTIzMTk1NTMyLWkxM2pqeDJyeHQ0M3h1bTUKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEyMDUyMzIwMDgyNS0xYjI0d2JveG1lNzdmMGd6CkBAIC00MzUsNyArNDM1LDcgQEAg
cm93X3JlY190b19pbmRleF9lbnRyeSgKIAkJCQkJcy1sYXRjaGVkIGFuZCB0aGUgbGF0Y2ggaGVs
ZAogCQkJCQlhcyBsb25nIGFzIHRoZSBkdHVwbGUgaXMgdXNlZCEgKi8KIAljb25zdCBkaWN0X2lu
ZGV4X3QqCWluZGV4LAkvKiE8IGluOiBpbmRleCAqLwotCXVsaW50KgkJCW9mZnNldHMsLyohPCBp
bi9vdXQ6IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCisJY29uc3QgdWxpbnQqCQlvZmZzZXRzLC8q
ITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCiAJdWxpbnQqCQkJbl9leHQsCS8qITwgb3V0
OiBudW1iZXIgb2YgZXh0ZXJuYWxseQogCQkJCQlzdG9yZWQgY29sdW1ucyAqLwogCW1lbV9oZWFw
X3QqCQloZWFwKQkvKiE8IGluOiBtZW1vcnkgaGVhcCBmcm9tIHdoaWNoCkBAIC00NjEsMTAgKzQ2
MSwxMCBAQCByb3dfcmVjX3RvX2luZGV4X2VudHJ5KAogCQljb3B5X3JlYyA9IHJlYzsKIAl9CiAK
LQlyZWNfb2Zmc19tYWtlX3ZhbGlkKGNvcHlfcmVjLCBpbmRleCwgb2Zmc2V0cyk7CisJcmVjX29m
ZnNfbWFrZV92YWxpZChjb3B5X3JlYywgaW5kZXgsIGNvbnN0X2Nhc3Q8dWxpbnQqPihvZmZzZXRz
KSk7CiAJZW50cnkgPSByb3dfcmVjX3RvX2luZGV4X2VudHJ5X2xvdygKIAkJY29weV9yZWMsIGlu
ZGV4LCBvZmZzZXRzLCBuX2V4dCwgaGVhcCk7Ci0JcmVjX29mZnNfbWFrZV92YWxpZChyZWMsIGlu
ZGV4LCBvZmZzZXRzKTsKKwlyZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIGNvbnN0X2Nh
c3Q8dWxpbnQqPihvZmZzZXRzKSk7CiAKIAlkdHVwbGVfc2V0X2luZm9fYml0cyhlbnRyeSwKIAkJ
CSAgICAgcmVjX2dldF9pbmZvX2JpdHMocmVjLCByZWNfb2Zmc19jb21wKG9mZnNldHMpKSk7CgpO
byBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==