From: marko.makela
Date: May 29 2012 6:38pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3894 to 3896) WL#6255
List-Archive: http://lists.mysql.com/commits/144013
Message-Id: <201205291839.q4TId7xj022595@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4OTYgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IGJ1ZyBmaXhlcy4K
ICAgICAgCiAgICAgIHByZXBhcmVfaW5wbGFjZV9hbHRlcl90YWJsZV9kaWN0KCk6IFBhc3MgdGhl
IHNhbWVfcGsgZmxhZyBjb3JyZWN0bHkgdG8KICAgICAgcm93X2xvZ19hbGxvY2F0ZSgpLgogICAg
ICAKICAgICAgaGFfaW5ub2Jhc2U6OmlucGxhY2VfYWx0ZXJfdGFibGUoKTogUmVsYXggYW4gYXNz
ZXJ0aW9uIG9uCiAgICAgIHRhYmxlLT5uX3JlZl9jb3VudC4gQSB0YWJsZSB0aGF0IGlzIGJlaW5n
IHJlYnVpbHQgb25saW5lIGNhbiBiZSBhY2Nlc3NlZC4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKIDM4OTUgTWFya28gTcOka2Vs
w6QJMjAxMi0wNS0yOQogICAgICBXTCM2MjU1IGJ1ZyBmaXhlcwogICAgICAKICAgICAgcm93X2xv
Z190YWJsZV91cGRhdGUoKTogQ29ycmVjdCBkZWJ1ZyBhc3NlcnRpb25zIGFib3V0IG9sZF9way4K
ICAgICAgRml4IGxvZ2dpbmcgZXJyb3JzLgogICAgICAKICAgICAgcm93X2xvZ190YWJsZV9nZXRf
cGsoKTogSW5pdGlhbGl6ZSB0aGUgcmV0dXJuIHZhbHVlLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9nLmNjCiAzODk0IE1hcmtvIE3DpGtlbMOkCTIwMTIt
MDUtMjkKICAgICAgV0wjNjI1NSBidWcgZml4CiAgICAgIAogICAgICByb3dfaW5zX2NsdXN0X2lu
ZGV4X2VudHJ5X2xvdygpOiBJbml0aWFsaXplIHJlYyBmb3Igb25saW5lIGxvZ2dpbmcuCgogICAg
bW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyOTE0MjQxOS03dmlmcjB4OTF1Y3R5bnpiCisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTIwNTI5MTgzNjI3LWN1M3lrZ3o5ZWlmMDVodngKQEAgLTE3NDAsOCAr
MTc0MCw4IEBAIGNvbF9mYWlsOgogCQlyd19sb2NrX3hfbG9jaygmY2x1c3RfaW5kZXgtPmxvY2sp
OwogCQlib29sIG9rID0gcm93X2xvZ19hbGxvY2F0ZSgKIAkJCWNsdXN0X2luZGV4LCBpbmRleGVk
X3RhYmxlLAotCQkJISEoaGFfYWx0ZXJfaW5mby0+aGFuZGxlcl9mbGFncwotCQkJICAgJiBBbHRl
cl9pbnBsYWNlX2luZm86OkFERF9QS19JTkRFWCkpOworCQkJIShoYV9hbHRlcl9pbmZvLT5oYW5k
bGVyX2ZsYWdzCisJCQkgICYgQWx0ZXJfaW5wbGFjZV9pbmZvOjpBRERfUEtfSU5ERVgpKTsKIAkJ
cndfbG9ja194X3VubG9jaygmY2x1c3RfaW5kZXgtPmxvY2spOwogCiAJCWlmICghb2spIHsKQEAg
LTI1NjEsNyArMjU2MSw4IEBAIG9vbToKIAogCS8qIG5fcmVmX2NvdW50IG11c3QgYmUgMSwgb3Ig
MiB3aGVuIHB1cmdlCiAJaGFwcGVucyB0byBiZSBleGVjdXRpbmcgb24gdGhpcyB2ZXJ5IHRhYmxl
LiAqLwotCURCVUdfQVNTRVJUKGN0eC0+aW5kZXhlZF90YWJsZSA9PSBwcmVidWlsdC0+dGFibGUK
KwlEQlVHX0FTU0VSVChjdHgtPm9ubGluZQorCQkgICAgfHwgY3R4LT5pbmRleGVkX3RhYmxlID09
IHByZWJ1aWx0LT50YWJsZQogCQkgICAgfHwgcHJlYnVpbHQtPnRhYmxlLT5uX3JlZl9jb3VudCAt
IDEgPD0gMSk7CiAJcHJlYnVpbHQtPnRyeC0+ZXJyb3JfaW5mbyA9IE5VTEw7CiAJY3R4LT50cngt
PmVycm9yX3N0YXRlID0gREJfU1VDQ0VTUzsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9n
LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI5MTQyNDE5LTd2aWZyMHg5
MXVjdHluemIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyOTE4MzYyNy1jdTN5a2d6OWVpZjA1aHZ4CkBAIC01
MjUsNyArNTI1LDEwIEBAIHJvd19sb2dfdGFibGVfdXBkYXRlKAogCXV0X2FkKHJ3X2xvY2tfb3du
KCZpbmRleC0+bG9jaywgUldfTE9DS19TSEFSRUQpCiAJICAgICAgfHwgcndfbG9ja19vd24oJmlu
ZGV4LT5sb2NrLCBSV19MT0NLX0VYKSk7CiAjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCisJ
dXRfYWQoIW9sZF9wayB8fCBvbGRfcGstPm5fZmllbGRzID09IDIgKyBvbGRfcGstPm5fZmllbGRz
X2NtcCk7CiAJdXRfYWQoIW9sZF9wayB8fCBEQVRBX1RSWF9JRF9MRU4gPT0gZHR1cGxlX2dldF9u
dGhfZmllbGQoCisJCSAgICAgIG9sZF9waywgb2xkX3BrLT5uX2ZpZWxkcyAtIDIpLT5sZW4pOwor
CXV0X2FkKCFvbGRfcGsgfHwgREFUQV9ST0xMX1BUUl9MRU4gPT0gZHR1cGxlX2dldF9udGhfZmll
bGQoCiAJCSAgICAgIG9sZF9waywgb2xkX3BrLT5uX2ZpZWxkcyAtIDEpLT5sZW4pOwogCiAJaWYg
KGRpY3RfaW5kZXhfaXNfY29ycnVwdGVkKGluZGV4KQpAQCAtNTQ1LDcgKzU0OCw3IEBAIHJvd19s
b2dfdGFibGVfdXBkYXRlKAogCWV4dHJhX3NpemUgPSByZWNfb2Zmc19leHRyYV9zaXplKG9mZnNl
dHMpIC0gb21pdF9zaXplOwogCiAJbXJlY19zaXplID0gcmVjX29mZnNfc2l6ZShvZmZzZXRzKSAt
IG9taXRfc2l6ZQotCQkrIChST1dfTE9HX0hFQURFUl9TSVpFICsgMSkgKyAoZXh0cmFfc2l6ZSA+
PSAweDgwKTsKKwkJKyBST1dfTE9HX0hFQURFUl9TSVpFICsgKGV4dHJhX3NpemUgPj0gMHg4MCk7
CiAKIAlpZiAoaW5kZXgtPm9ubGluZV9sb2ctPnNhbWVfcGspIHsKIAkJdXRfYWQoIW9sZF9wayk7
CkBAIC01NjYsNyArNTY5LDcgQEAgcm93X2xvZ190YWJsZV91cGRhdGUoCiAJCQkJCSBtcmVjX3Np
emUsICZhdmFpbF9zaXplKSkgewogCQkqYisrID0gUk9XX1RfVVBEQVRFOwogCi0JCWlmIChvbGRf
cGtfZXh0cmFfc2l6ZSkgeworCQlpZiAob2xkX3BrX3NpemUpIHsKIAkJCSpiKysgPSBvbGRfcGtf
ZXh0cmFfc2l6ZTsKIAogCQkJcmVjX2NvbnZlcnRfZHR1cGxlX3RvX3JlY19jb21wKApAQCAtNjEx
LDYgKzYxNCw4IEBAIHJvd19sb2dfdGFibGVfZ2V0X3BrKAogCWNvbnN0IHVsaW50KglvZmZzZXRz
LC8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMsaW5kZXgpICovCiAJbWVtX2hlYXBfdCoqCWhl
YXApCS8qITwgaW4vb3V0OiBtZW1vcnkgaGVhcCB3aGVyZSBhbGxvY2F0ZWQgKi8KIHsKKwlkdHVw
bGVfdCoJdHVwbGUJPSBOVUxMOworCiAJdXRfYWQoZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkp
OwogCXV0X2FkKGRpY3RfaW5kZXhfaXNfb25saW5lX2RkbChpbmRleCkpOwogCXV0X2FkKCFvZmZz
ZXRzIHx8IHJlY19vZmZzX3ZhbGlkYXRlKHJlYywgaW5kZXgsIG9mZnNldHMpKTsKQEAgLTYyNyw4
ICs2MzIsNiBAQCByb3dfbG9nX3RhYmxlX2dldF9waygKIAkJcmV0dXJuKE5VTEwpOwogCX0KIAot
CWR0dXBsZV90Kgl0dXBsZTsKLQogCW11dGV4X2VudGVyKCZpbmRleC0+b25saW5lX2xvZy0+bXV0
ZXgpOwogCiAJLyogaW5kZXgtPm9ubGluZV9sb2ctPmVycm9yIGlzIHByb3RlY3RlZCBieSB0aGUg
YWJvdmUgbXV0ZXguICovCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFp
bHMpLg==