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

IDM5NjMgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xMQogICAgICBGaXggV0wjNjI1NSByYjoxMTA1
IFByb2JsZW0gMTQuCiAgICAgIAogICAgICByb3dfbG9nX3RhYmxlX2FwcGx5X29wKCk6IEludm9r
ZSByZWNfb2Zmc19zZXRfbl9maWVsZHMoKSBiZWZvcmUKICAgICAgcmVjb21wdXRpbmcgb2Zmc2V0
cy4gVGhpcyBvbWlzc2lvbiBjYXVzZWQgb2Zmc2V0cyB0byBiZSBjb21wdXRlZCBvbgogICAgICBh
biBpbmRleCBwcmVmaXggb25seS4KICAgICAgCiAgICAgIHJvd19sb2dfdGFibGVfYXBwbHlfb3Bz
KCk6IEFsbG9jYXRlIGVub3VnaCBzcGFjZSBmb3Igb2Zmc2V0cywgaW4gY2FzZQogICAgICBuZXdf
aW5kZXgtPm5fdW5pcSArIDIgZXhjZWVkcyBpbmRleC0+bl9maWVsZHMuCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKIDM5NjIgTWFya28gTcOka2Vs
w6QJMjAxMi0wNi0xMQogICAgICBXTCM2MjU1IGJ1ZyBmaXggZm9yIGFwcGx5aW5nIGJ1ZmZlcmVk
IGRlbGV0ZSB3aXRoIEFERCBQUklNQVJZIEtFWS4KICAgICAgCiAgICAgIHJvd19sb2dfdGFibGVf
YXBwbHlfZGVsZXRlKCk6IFJlbW92ZSB0aGUgcGFyYW1ldGVyIHRyeF9pZF9jb2wuCiAgICAgIFJl
bmFtZSBuZXdfdHJ4X2lkX2NvbCB0byB0cnhfaWRfY29sLiBJbiB0aGUgYnVmZmVyZWQgcmVjb3Jk
LCB3ZSBoYXZlCiAgICAgIHRoZSBQUklNQVJZIEtFWSBjb2x1bW5zIGFzIHRoZXkgYXBwZWFyIGlu
IHRoZSBuZXcgdGFibGUuCiAgICAgIFRodXMsIHRoZSBzdHJ1Y3R1cmUgb2YgdGhlIG9sZCBjbHVz
dGVyZWQgaW5kZXggcmVjb3JkcyBpcyBpcnJlbGV2YW50LgogICAgICAKICAgICAgVGhpcyBhZGRy
ZXNzZXMgcmI6MTEwNSBQcm9ibGVtIDEyLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwbG9nLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjExMTI0MDIzLXhud29pYmRlMmE5bXd2
bjAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEyMDYxMTIwMDA1MS11NnU1cHpvbGZoNnhsenZ4CkBAIC0xNTQxLDYg
KzE1NDEsMTIgQEAgZGVsZXRlX2luc2VydDoKIAogCWlmICh1cGRfZ2V0X250aF9maWVsZCh1cGRh
dGUsIDApLT5maWVsZF9ubyA8IG5ld190cnhfaWRfY29sKSB7CiAJCWlmIChkdXAtPmluZGV4LT5v
bmxpbmVfbG9nLT5zYW1lX3BrKSB7CisJCQkvKiBUaGUgUk9XX1RfVVBEQVRFIGxvZyByZWNvcmQg
c2hvdWxkIG9ubHkgYmUKKwkJCXdyaXR0ZW4gd2hlbiB0aGUgUFJJTUFSWSBLRVkgZmllbGRzIG9m
IHRoZQorCQkJcmVjb3JkIGRpZCBub3QgY2hhbmdlIGluIHRoZSBvbGQgdGFibGUuICBXZQorCQkJ
Y2FuIG9ubHkgZ2V0IGEgY2hhbmdlIG9mIFBSSU1BUlkgS0VZIGNvbHVtbnMKKwkJCWluIHRoZSBy
ZWJ1aWx0IHRhYmxlIGlmIHRoZSBQUklNQVJZIEtFWSB3YXMKKwkJCXJlZGVmaW5lZCAoIXNhbWVf
cGspLiAqLwogCQkJdXRfYWQoMCk7CiAJCQllcnJvciA9IERCX0NPUlJVUFRJT047CiAJCQlnb3Rv
IGZ1bmNfZXhpdDsKQEAgLTE3NDMsNiArMTc0OSw3IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfb3Ao
CiAJCQlyZXR1cm4oTlVMTCk7CiAJCX0KIAorCQlyZWNfb2Zmc19zZXRfbl9maWVsZHMob2Zmc2V0
cywgZHVwLT5pbmRleC0+bl9maWVsZHMpOwogCQlyZWNfaW5pdF9vZmZzZXRzX2NvbXBfb3JkaW5h
cnkoCiAJCQltcmVjLCAwLCBkdXAtPmluZGV4LCBkdXAtPmluZGV4LT5uX251bGxhYmxlLCBvZmZz
ZXRzKTsKIApAQCAtMTg1Myw2ICsxODYwLDggQEAgcm93X2xvZ190YWJsZV9hcHBseV9vcCgKIAkJ
CQlyZXR1cm4oTlVMTCk7CiAJCQl9CiAKKwkJCS8qIEdldCBvZmZzZXRzIGZvciBQUklNQVJZIEtF
WSwKKwkJCURCX1RSWF9JRCwgREJfUk9MTF9QVFIuICovCiAJCQlyZWNfb2Zmc19zZXRfbl9maWVs
ZHMob2Zmc2V0cywgbmV3X2luZGV4LT5uX3VuaXEgKyAyKTsKIAkJCXJlY19pbml0X29mZnNldHNf
Y29tcF9vcmRpbmFyeSgKIAkJCQltcmVjLCAwLCBuZXdfaW5kZXgsIDAsIG9mZnNldHMpOwpAQCAt
MTk2OSw3ICsxOTc4LDggQEAgcm93X2xvZ190YWJsZV9hcHBseV9vcHMoCiAJZGljdF9pbmRleF90
KgluZXdfaW5kZXgJPSBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCgKIAkJbmV3X3RhYmxlKTsK
IAljb25zdCB1bGludAlpCQk9IDEgKyBSRUNfT0ZGU19IRUFERVJfU0laRQotCQkrIGRpY3RfaW5k
ZXhfZ2V0X25fZmllbGRzKGluZGV4KTsKKwkJKyB1dF9tYXgoZGljdF9pbmRleF9nZXRfbl9maWVs
ZHMoaW5kZXgpLAorCQkJIGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVlKG5ld19pbmRleCkgKyAyKTsK
IAljb25zdCB1bGludAl0cnhfaWRfY29sCT0gZGljdF9jb2xfZ2V0X2NsdXN0X3BvcygKIAkJZGlj
dF90YWJsZV9nZXRfc3lzX2NvbChpbmRleC0+dGFibGUsIERBVEFfVFJYX0lEKSwgaW5kZXgpOwog
CWNvbnN0IHVsaW50CW5ld190cnhfaWRfY29sCT0gZGljdF9jb2xfZ2V0X2NsdXN0X3BvcygKCk5v
IGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku