From: marko.makela
Date: May 28 2012 8:21pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3886 to 3887) WL#6255
List-Archive: http://lists.mysql.com/commits/144005
Message-Id: <201205282021.q4SKL5Ka011399@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4ODcgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOAogICAgICBXTCM2MjU1IGRlYnVnIGFzc2Vy
dGlvbiByZWxheGF0aW9uCiAgICAgIAogICAgICByZWNfZ2V0X2NvbnZlcnRlZF9zaXplX2NvbXBf
cHJlZml4KCksIHJlY19jb252ZXJ0X2R0dXBsZV90b19yZWNfY29tcCgpOgogICAgICBBbGxvdyBu
X251bGwgPCBpbmRleC0+bl9udWxsYWJsZS4gQXNzZXJ0IHRoYXQgb2YgdGhlIHByb2Nlc3NlZCBm
aWVsZHMsCiAgICAgIG5vIG1vcmUgdGhhbiBuX251bGwgYXJlIE5VTExhYmxlLgoKICAgIG1vZGlm
aWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0wcmVjLmNjCiAzODg2IE1hcmtvIE3D
pGtlbMOkCTIwMTItMDUtMjgKICAgICAgV0wjNjI1NTogTG9nZ2luZyBvZiByb2xsZWQtYmFjayB0
cmFuc2FjdGlvbnMuCiAgICAgIAogICAgICBUbyBhdm9pZCBkZXJlZmVyZW5jaW5nIGZyZWVkIEJM
T0IgcGFnZXMgZHVyaW5nIG9ubGluZSB0YWJsZSByZWJ1aWxkLAogICAgICB3ZSBtdXN0IGtlZXAg
dHJhY2sgb24gcm9sbGJhY2tzIG9mIGluc2VydHMgdG8gdGhlIHRhYmxlIHRoYXQgaXMKICAgICAg
YmVpbmcgcmVidWlsdCwgYW5kIHNraXAgYW55IHJlY29yZHMgdGhhdCB3ZXJlIGluc2VydGVkIGJ5
IHN1Y2ggYQogICAgICB0cmFuc2FjdGlvbi4gQXMgYW4gb3B0aW1pemF0aW9uLCB3ZSBhbHNvIGtl
ZXAgdHJhY2sgb2Ygcm9sbGVkLWJhY2sgdXBkYXRlcywKICAgICAgc28gdGhhdCB3ZSBjYW4gY29w
eSBsZXNzIGRhdGEgZHVyaW5nIG9ubGluZSB0YWJsZSByZWJ1aWxkLgogICAgICAKICAgICAgcm93
X2xvZ190YWJsZV9yb2xsYmFjaygpOiBSZXBvcnQgYSByb2xsZWQtYmFjayB0cmFuc2FjdGlvbi4g
Q2FsbGVkIGJ5CiAgICAgIHJvd191bmRvX2lucygpIGFuZCByb3dfdW5kb19tb2QoKS4KICAgICAg
CiAgICAgIHJvd19sb2dfdGFibGVfaXNfcm9sbGJhY2soKTogRGV0ZXJtaW5lIGlmIGEgZ2l2ZW4g
dHJhbnNhY3Rpb24gd2FzCiAgICAgIHJvbGxlZCBiYWNrIGFmdGVyIGl0IG1vZGlmaWVkIHRoZSB0
YWJsZSB0aGF0IGlzIGJlaW5nIHJlYnVpbHQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9yb3cwbG9nLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGxvZy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdWlucy5jYwogICAgICBzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwdW1vZC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9yZW0vcmVtMHJlYy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yZW0vcmVtMHJl
Yy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyODE0MDkwMC1rMWh1Yjhm
ZncydTJsZGN6CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvcmVtL3JlbTByZWMuY2MJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjgyMDE5MDgtZG85YW5zdTBwd2R2cTFqZQpAQCAt
Nzk4LDcgKzc5OCw2IEBAIHJlY19nZXRfY29udmVydGVkX3NpemVfY29tcF9wcmVmaXgoCiAJdXRf
YWQoZmllbGRzKTsKIAl1dF9hZChuX2ZpZWxkcyA+IDApOwogCXV0X2FkKG5fZmllbGRzIDw9IGRp
Y3RfaW5kZXhfZ2V0X25fZmllbGRzKGluZGV4KSk7Ci0JdXRfYWQobl9udWxsID49IGluZGV4LT5u
X251bGxhYmxlKTsKIAogCWV4dHJhX3NpemUgPSBSRUNfTl9ORVdfRVhUUkFfQllURVMgKyBVVF9C
SVRTX0lOX0JZVEVTKG5fbnVsbCk7CiAJZGF0YV9zaXplID0gMDsKQEAgLTgxNSw2ICs4MTQsOCBA
QCByZWNfZ2V0X2NvbnZlcnRlZF9zaXplX2NvbXBfcHJlZml4KAogCiAJCXV0X2FkKGRpY3RfY29s
X3R5cGVfYXNzZXJ0X2VxdWFsKGNvbCwKIAkJCQkJCSBkZmllbGRfZ2V0X3R5cGUoJmZpZWxkc1tp
XSkpKTsKKwkJLyogQWxsIE5VTExhYmxlIGZpZWxkcyBtdXN0IGJlIGluY2x1ZGVkIGluIHRoZSBu
X251bGwgY291bnQuICovCisJCXV0X2FkKChjb2wtPnBydHlwZSAmIERBVEFfTk9UX05VTEwpIHx8
IG5fbnVsbC0tKTsKIAogCQlpZiAoZGZpZWxkX2lzX251bGwoJmZpZWxkc1tpXSkpIHsKIAkJCS8q
IE5vIGxlbmd0aCBpcyBzdG9yZWQgZm9yIE5VTEwgZmllbGRzLiAqLwpAQCAtMTExNCw3ICsxMTE1
LDYgQEAgcmVjX2NvbnZlcnRfZHR1cGxlX3RvX3JlY19jb21wKAogCXV0X2FkKGV4dHJhID09IDAg
fHwgZGljdF90YWJsZV9pc19jb21wKGluZGV4LT50YWJsZSkpOwogCXV0X2FkKGV4dHJhID09IDAg
fHwgZXh0cmEgPT0gUkVDX05fTkVXX0VYVFJBX0JZVEVTKTsKIAl1dF9hZChuX2ZpZWxkcyA+IDAp
OwotCXV0X2FkKG5fbnVsbCA+PSBpbmRleC0+bl9udWxsYWJsZSk7CiAKIAlzd2l0Y2ggKFVOSVZf
RVhQRUNUKHN0YXR1cywgUkVDX1NUQVRVU19PUkRJTkFSWSkpIHsKIAljYXNlIFJFQ19TVEFUVVNf
T1JESU5BUlk6CkBAIC0xMTYwLDYgKzExNjAsNyBAQCByZWNfY29udmVydF9kdHVwbGVfdG9fcmVj
X2NvbXAoCiAJCWlmICghKGR0eXBlX2dldF9wcnR5cGUodHlwZSkgJiBEQVRBX05PVF9OVUxMKSkg
ewogCQkJLyogbnVsbGFibGUgZmllbGQgKi8KIAkJCXV0X2FkKGluZGV4LT5uX251bGxhYmxlID4g
MCk7CisJCQl1dF9hZChuX251bGwtLSk7CiAKIAkJCWlmIChVTklWX1VOTElLRUxZKCEoYnl0ZSkg
bnVsbF9tYXNrKSkgewogCQkJCW51bGxzLS07CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBm
b3IgcHVzaCBlbWFpbHMpLg==