From: marko.makela
Date: May 31 2012 12:48pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3916 to 3917) WL#6255
List-Archive: http://lists.mysql.com/commits/144048
Message-Id: <201205311248.q4VCmIQ5004299@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MTcgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0zMQogICAgICBXTCM2MjU1IGR1cGxpY2F0ZSBr
ZXkgZXJyb3IgcmVwb3J0aW5nCiAgICAgIAogICAgICBXaGVuIGFuIGVycm9yIG9jY3VycyBkdXJp
bmcgb25saW5lIHJlYnVpbGQgYXBwbHksIGNvbnZlcnQgdGhlIGJ1ZmZlcmVkIHJvdwogICAgICBp
bnRvIHRoZSBNeVNRTCByZWNvcmQgYnVmZmVyLCBzbyB0aGF0IGl0IGNhbiBiZSB1c2VkIGluIGVy
cm9yIG1lc3NhZ2VzLAogICAgICBzdWNoIGFzIGR1cGxpY2F0ZSBrZXkgZXJyb3IuCiAgICAgIAog
ICAgICByb3dfbG9nX3RhYmxlX2FwcGx5X2luc2VydCgpLCByb3dfbG9nX3RhYmxlX2FwcGx5X3Vw
ZGF0ZSgpOiBJbnZva2UKICAgICAgaW5ub2Jhc2VfcmVjX3RvX215c3FsKCkgb24gZXJyb3IuCiAg
ICAgIAogICAgICBXaGVuIGRlbGV0ZSBmYWlscywgd2Ugd2lsbCBub3QgaW52b2tlIHRoZSBjb252
ZXJzaW9uLCBiZWNhdXNlIHRoZSBidWZmZXJlZAogICAgICByZWNvcmQgY29udGFpbnMgdGhlIFBS
SU1BUlkgS0VZIGluIHRoZSBuZXcgdGFibGUsIHdoaWNoIGNvdWxkIGRpZmZlciBmcm9tCiAgICAg
IHRoZSBvbGQgdGFibGUgKGRpZmZlcmVudCBjb2x1bW5zKS4KCiAgICBtb2RpZmllZDoKICAgICAg
bXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGItdGFibGUtb25saW5lLnJlc3VsdAogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCiAzOTE2IE1hcmtvIE3DpGtlbMOkCTIw
MTItMDUtMzEgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC10cnVuayB0byBteXNxbC10cnVuay13
bDYyNTUuCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3QvaW5jbHVkZS93bDYzMDEuaW5jCiAg
ICAgIG15c3FsLXRlc3Qvci93bDYzMDFfMV9ub3Rfd2luZG93cy5yZXN1bHQKICAgICAgbXlzcWwt
dGVzdC9yL3dsNjMwMV8yX25vdF93aW5kb3dzLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Ivd2w2
MzAxXzMucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC93bDYzMDFfMV9ub3Rfd2luZG93cy1tYXN0
ZXIub3B0CiAgICAgIG15c3FsLXRlc3QvdC93bDYzMDFfMV9ub3Rfd2luZG93cy50ZXN0CiAgICAg
IG15c3FsLXRlc3QvdC93bDYzMDFfMl9ub3Rfd2luZG93cy1tYXN0ZXIub3B0CiAgICAgIG15c3Fs
LXRlc3QvdC93bDYzMDFfMl9ub3Rfd2luZG93cy50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC93bDYz
MDFfMy1tYXN0ZXIub3B0CiAgICAgIG15c3FsLXRlc3QvdC93bDYzMDFfMy50ZXN0CiAgICBtb2Rp
ZmllZDoKICAgICAgbXlzcWwtdGVzdC9yL2lwdjYucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9t
eXNxbGQtLWhlbHAtbm90d2luLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvbXlzcWxkLS1oZWxw
LXdpbi5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L2lwdjYudGVzdAogICAgICBzcWwvbXlzcWxk
LmNjCiAgICAgIHNxbC9zeXNfdmFycy5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYw
Zmx1LmNjCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9k
Yi10YWJsZS1vbmxpbmUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lu
bm9kYi10YWJsZS1vbmxpbmUucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTIwNTMxMTAyNDQ3LTRvZWczbGJmZTFyZDgxOWUKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v
ZGIvci9pbm5vZGItdGFibGUtb25saW5lLnJlc3VsdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEyMDUzMTEyNDI0MC1mZWVhNWcybjJ4NWdqc2VpCkBAIC04OSw3ICs4OSw3IEBAIGRk
bF9wZW5kaW5nX2FsdGVyX3RhYmxlCTEKIEJFR0lOOwogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDQs
NywyKTsKIFNFVCBERUJVR19TWU5DID0gJ25vdyBTSUdOQUwgaW5zZXJ0X2RvbmUnOwotRVJST1Ig
MjMwMDA6IER1cGxpY2F0ZSBlbnRyeSAnMCcgZm9yIGtleSAnUFJJTUFSWScKK0VSUk9SIDIzMDAw
OiBEdXBsaWNhdGUgZW50cnkgJzQnIGZvciBrZXkgJ1BSSU1BUlknCiBST0xMQkFDSzsKIFNIT1cg
Q1JFQVRFIFRBQkxFIHQxOwogVGFibGUJQ3JlYXRlIFRhYmxlCgo9PT0gbW9kaWZpZWQgZmlsZSAn
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9y
b3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUzMTEwMjQ0
Ny00b2VnM2xiZmUxcmQ4MTllCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MzExMjQyNDAtZmVlYTVnMm4yeDVn
anNlaQpAQCAtMzAsNiArMzAsNyBAQCBDcmVhdGVkIDIwMTEtMDUtMjYgTWFya28gTWFrZWxhCiAj
aW5jbHVkZSAicm93MG1lcmdlLmgiCiAjaW5jbHVkZSAiZGF0YTBkYXRhLmgiCiAjaW5jbHVkZSAi
cXVlMHF1ZS5oIgorI2luY2x1ZGUgImhhbmRsZXIwYWx0ZXIuaCIKIAogI2luY2x1ZGU8c2V0Pgog
CkBAIC0xMTAzLDEwICsxMTA0LDYgQEAgcm93X2xvZ190YWJsZV9hcHBseV9pbnNlcnRfbG93KAog
CWNhc2UgREJfU1VDQ0VTU19MT0NLRURfUkVDOgogCQkvKiBUaGUgcm93IGhhZCBhbHJlYWR5IGJl
ZW4gY29waWVkIHRvIHRoZSB0YWJsZS4gKi8KIAkJcmV0dXJuKERCX1NVQ0NFU1MpOwotCWNhc2Ug
REJfRFVQTElDQVRFX0tFWToKLQkJLyogVE9ETzogcmVwb3J0IHRoZSBkdXBsaWNhdGUga2V5IHVu
bGVzcyB0aGUgcmVjb3JkIGlzCi0JCWEgZnVsbCBtYXRjaCBvZiB3aGF0IHdlIHRyaWVkIHRvIGlu
c2VydCAqLwotCQkvKiBmYWxsIHRocm91Z2ggKi8KIAlkZWZhdWx0OgogCQlyZXR1cm4oZXJyb3Ip
OwogCX0KQEAgLTExMjIsMTAgKzExMTksNiBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2luc2VydF9s
b3coCiAJCQlpbmRleCwgb2Zmc2V0c19oZWFwLCBoZWFwLCBlbnRyeSwgdGhyKTsKIAl9IHdoaWxl
IChlcnJvciA9PSBEQl9TVUNDRVNTKTsKIAotCWlmIChlcnJvciA9PSBEQl9EVVBMSUNBVEVfS0VZ
KSB7Ci0JCS8qIFRPRE86IHJlcG9ydCBhIGR1cGxpY2F0ZSAqLwotCX0KLQogCXJldHVybihlcnJv
cik7CiB9CiAKQEAgLTExNDksMTAgKzExNDIsMTggQEAgcm93X2xvZ190YWJsZV9hcHBseV9pbnNl
cnQoCiAJcm93X21lcmdlX2R1cF90KglkdXApCQkvKiE8IGluL291dDogZm9yIHJlcG9ydGluZwog
CQkJCQkJZHVwbGljYXRlIGtleSBlcnJvcnMgKi8KIHsKLQljb25zdCBkdHVwbGVfdCoJcm93ID0g
cm93X2xvZ190YWJsZV9hcHBseV9jb252ZXJ0X21yZWMoCisJY29uc3QgZHR1cGxlX3QqCXJvdwk9
IHJvd19sb2dfdGFibGVfYXBwbHlfY29udmVydF9tcmVjKAogCQltcmVjLCBvZmZzZXRzLCBoZWFw
LCBuZXdfdGFibGUsIGFsdGVyZWRfdGFibGUsIGR1cCk7Ci0JcmV0dXJuKHJvd19sb2dfdGFibGVf
YXBwbHlfaW5zZXJ0X2xvdyh0aHIsIHJvdywgb2Zmc2V0c19oZWFwLCBoZWFwLAotCQkJCQkgICAg
ICBuZXdfdGFibGUsIGFsdGVyZWRfdGFibGUsIGR1cCkpOworCWRiZXJyX3QJCWVycm9yCT0gcm93
X2xvZ190YWJsZV9hcHBseV9pbnNlcnRfbG93KAorCQl0aHIsIHJvdywgb2Zmc2V0c19oZWFwLCBo
ZWFwLCBuZXdfdGFibGUsIGFsdGVyZWRfdGFibGUsIGR1cCk7CisKKwlpZiAoZXJyb3IgIT0gREJf
U1VDQ0VTUykgeworCQkvKiBSZXBvcnQgdGhlIGVycm9uZW91cyByb3cgdXNpbmcgdGhlIG9sZAor
CQl2ZXJzaW9uIG9mIHRoZSB0YWJsZS4gKi8KKwkJaW5ub2Jhc2VfcmVjX3RvX215c3FsKGR1cC0+
dGFibGUsIG1yZWMsIGR1cC0+aW5kZXgsIG9mZnNldHMpOworCX0KKworCXJldHVybihlcnJvcik7
CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCkBAIC0xMzMwLDYgKzEzMzEsMTAgQEAgYWxsX2RvbmU6CiAJCX0KIAl9CiAKKwkv
KiBXZSBjYW5ub3QgaW52b2tlIGlubm9iYXNlX3JlY190b19teXNxbCgpIHRvIGNvbnZlcnQgYW4K
KwllcnJvbmVvdXMgbXJlYyB0byBhIE15U1FMIHJvdyBpZiBhIFBSSU1BUlkgS0VZIGlzIGJlaW5n
IGNyZWF0ZWQuCisJRXJyb3IgbWVzc2FnZXMgb24gZGVsZXRlIHNob3VsZCBub3QgbmVlZCB0aGUg
cm93LCB0aG91Z2guIE9ubHkKKwltZXNzYWdlcyBhYm91dCBkdXBsaWNhdGVzIG9yIGZhaWxlZCBj
b252ZXJzaW9ucyB1c2UgdGhlIHJvdy4gKi8KIAlyZXR1cm4ocm93X2xvZ190YWJsZV9hcHBseV9k
ZWxldGVfbG93KCZwY3VyLCBvZmZzZXRzLCBoZWFwLCAmbXRyKSk7CiB9CiAKQEAgLTEzNjcsNiAr
MTM3Miw3IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfdXBkYXRlKAogCWRpY3RfaW5kZXhfdCoJaW5k
ZXggPSBkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleChuZXdfdGFibGUpOwogCW10cl90CQltdHI7
CiAJYnRyX3BjdXJfdAlwY3VyOworCWRiZXJyX3QJCWVycm9yOwogCiAJdXRfYWQoZHR1cGxlX2dl
dF9uX2ZpZWxkc19jbXAob2xkX3BrKQogCSAgICAgID09IGRpY3RfaW5kZXhfZ2V0X25fdW5pcXVl
KGluZGV4KSk7CkBAIC0xMzk5LDkgKzE0MDUsMTkgQEAgcm93X2xvZ190YWJsZV9hcHBseV91cGRh
dGUoCiAJCW10cl9jb21taXQoJm10cik7CiBpbnNlcnQ6CiAJCS8qIFRoZSByb3cgd2FzIG5vdCBm
b3VuZC4gSW5zZXJ0IGl0LiAqLwotCQlyZXR1cm4ocm93X2xvZ190YWJsZV9hcHBseV9pbnNlcnRf
bG93KAotCQkJICAgICAgIHRociwgcm93LCBvZmZzZXRzX2hlYXAsIGhlYXAsCi0JCQkgICAgICAg
bmV3X3RhYmxlLCBhbHRlcmVkX3RhYmxlLCBkdXApKTsKKwkJZXJyb3IgPSByb3dfbG9nX3RhYmxl
X2FwcGx5X2luc2VydF9sb3coCisJCQl0aHIsIHJvdywgb2Zmc2V0c19oZWFwLCBoZWFwLAorCQkJ
bmV3X3RhYmxlLCBhbHRlcmVkX3RhYmxlLCBkdXApOworCisJCWlmIChlcnJvciAhPSBEQl9TVUND
RVNTKSB7CitlcnJfZXhpdDoKKwkJCS8qIFJlcG9ydCB0aGUgZXJyb25lb3VzIHJvdyB1c2luZyB0
aGUgb2xkCisJCQl2ZXJzaW9uIG9mIHRoZSB0YWJsZS4gKi8KKwkJCWlubm9iYXNlX3JlY190b19t
eXNxbCgKKwkJCQlkdXAtPnRhYmxlLCBtcmVjLCBkdXAtPmluZGV4LCBvZmZzZXRzKTsKKwkJfQor
CisJCXJldHVybihlcnJvcik7CiAJfQogCiAJLyogVXBkYXRlIHRoZSByZWNvcmQuICovCkBAIC0x
NDE0LDcgKzE0MzAsOCBAQCBpbnNlcnQ6CiAJY29uc3QgdXBkX3QqCXVwZGF0ZQk9IHJvd191cGRf
YnVpbGRfZGlmZmVyZW5jZV9iaW5hcnkoCiAJCWluZGV4LCBlbnRyeSwgYnRyX3BjdXJfZ2V0X3Jl
YygmcGN1ciksIGN1cl9vZmZzZXRzLAogCQlmYWxzZSwgTlVMTCwgaGVhcCk7Ci0JZGJlcnJfdAkJ
ZXJyb3IJPSBEQl9TVUNDRVNTOworCisJZXJyb3IgPSBEQl9TVUNDRVNTOwogCiAJaWYgKCF1cGRh
dGUtPm5fZmllbGRzKSB7CiAJCS8qIE5vdGhpbmcgdG8gZG8uICovCkBAIC0xNDMzLDcgKzE0NTAs
NyBAQCBkZWxldGVfaW5zZXJ0OgogCQl1dF9hZChtdHIuc3RhdGUgPT0gTVRSX0NPTU1JVFRFRCk7
CiAKIAkJaWYgKGVycm9yICE9IERCX1NVQ0NFU1MpIHsKLQkJCXJldHVybihlcnJvcik7CisJCQln
b3RvIGVycl9leGl0OwogCQl9CiAKIAkJZ290byBpbnNlcnQ7CkBAIC0xNTY4LDYgKzE1ODUsMTAg
QEAgZGVsZXRlX2luc2VydDoKIAogZnVuY19leGl0OgogCW10cl9jb21taXQoJm10cik7CisJaWYg
KGVycm9yICE9IERCX1NVQ0NFU1MpIHsKKwkJZ290byBlcnJfZXhpdDsKKwl9CisKIAlyZXR1cm4o
ZXJyb3IpOwogfQogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMp
Lg==