From: marko.makela
Date: June 14 2012 9:20am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3978 to 3979) WL#6255
List-Archive: http://lists.mysql.com/commits/144224
Message-Id: <20120614092022.19489.55533.3979@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NzkgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xNAogICAgICBXTCM2MjU1IGNsZWFudXA6IFJl
bW92ZSBkaWN0X3RhYmxlX2lzX29ubGluZV9yZWJ1aWxkKCkuCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaAogICAgICBzdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDBkaWN0LmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBt
ZXJnZS5jYwogMzk3OCBNYXJrbyBNw6RrZWzDpAkyMDEyLTA2LTE0CiAgICAgIFdMIzYyNTUgcmI6
MTEwNSBQcm9ibGVtIDI1IChtZW1vcnkgY29ycnVwdGlvbikgZml4LgogICAgICAKICAgICAgcm93
X2luc19zZWNfaW5kZXhfZW50cnlfbG93KCk6IFBhc3Mgb2Zmc2V0c19oZWFwIHRvIHRoZSBCLXRy
ZWUgZnVuY3Rpb25zLgogICAgICBPdGhlcndpc2UsIHRoZSBkdHVwbGVfdCogZW50cnkgY291bGQg
YmUgZnJlZWQgYW5kIG92ZXJ3cml0dGVuIGluCiAgICAgIGJ0cl9wYWdlX3NwbGl0X2FuZF9pbnNl
cnQoKSwgd2hpY2ggaW52b2tlcyBtZW1faGVhcF9lbXB0eSgpLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9kaWN0MGRpY3QuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYx
NDA2NDkyOC12OWY2YWl3c2xkZWNwbXR0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9k
aWN0MGRpY3QuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYxNDA4MDkwNi1v
MzdjbW5pNHYyM21wMDV5CkBAIC0xMzg2LDE3ICsxMzg2LDYgQEAgZGljdF9pbmRleF9pc19vbmxp
bmVfZGRsKAogLyo9PT09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGRpY3RfaW5kZXhfdCoJ
aW5kZXgpCS8qITwgaW46IGluZGV4ICovCiAJX19hdHRyaWJ1dGVfXygobm9ubnVsbCwgd2Fybl91
bnVzZWRfcmVzdWx0KSk7Ci0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1EZXRlcm1pbmVzIGlmIGEgdGFibGUg
aXMgYmVpbmcgcmVidWlsdCBvbmxpbmUsCi1hbGxvd2luZyBjb25jdXJyZW50IG1vZGlmaWNhdGlv
bnMgdG8gdGhlIHRhYmxlLgotQHJldHZhbCB0cnVlIGlmIHRoZSB0YWJsZSBpcyBiZWluZyByZWJ1
aWx0IG9ubGluZQotQHJldHZhbCBmYWxzZSBvdGhlcndpc2UgKi8KLVVOSVZfSU5MSU5FCi1ib29s
Ci1kaWN0X3RhYmxlX2lzX29ubGluZV9yZWJ1aWxkKAotLyo9PT09PT09PT09PT09PT09PT09PT09
PT09Ki8KLQljb25zdCBkaWN0X3RhYmxlX3QqCXRhYmxlKQkvKiE8IGluOiB0YWJsZSAqLwotCV9f
YXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Ki8vKioKIExvZ3MgYW4gb3BlcmF0aW9uIHRvIGEgc2Vjb25kYXJ5IGluZGV4IHRoYXQgaXMgYmVp
bmcgY3JlYXRlZC4gKi8KIFVOSVZfSU5URVJOCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2RpY3QwZGljdC5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYxNDA2
NDkyOC12OWY2YWl3c2xkZWNwbXR0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0
MGRpY3QuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTQwODA5MDYtbzM3
Y21uaTR2MjNtcDA1eQpAQCAtMTIzNSwyMCArMTIzNSw2IEBAIGRpY3RfaW5kZXhfaXNfb25saW5l
X2RkbCgKIAkJCSAgICAgIT0gT05MSU5FX0lOREVYX0NPTVBMRVRFKSk7CiB9CiAKLS8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKLURldGVybWluZXMgaWYgYSB0YWJsZSBpcyBiZWluZyByZWJ1aWx0IG9ubGluZSwK
LWFsbG93aW5nIGNvbmN1cnJlbnQgbW9kaWZpY2F0aW9ucyB0byB0aGUgdGFibGUuCi1AcmV0dmFs
IHRydWUgaWYgdGhlIHRhYmxlIGlzIGJlaW5nIHJlYnVpbHQgb25saW5lCi1AcmV0dmFsIGZhbHNl
IG90aGVyd2lzZSAqLwotVU5JVl9JTkxJTkUKLWJvb2wKLWRpY3RfdGFibGVfaXNfb25saW5lX3Jl
YnVpbGQoCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT0qLwotCWNvbnN0IGRpY3RfdGFibGVf
dCoJdGFibGUpCS8qITwgaW46IHRhYmxlICovCi17Ci0JcmV0dXJuKGRpY3RfaW5kZXhfaXNfb25s
aW5lX2RkbChkaWN0X3RhYmxlX2dldF9maXJzdF9pbmRleCh0YWJsZSkpKTsKLX0KLQogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKIEF0dGVtcHRzIHRvIGxvZyBhbiBvcGVyYXRpb24gb24gYSBzZWNvbmRhcnkg
aW5kZXggdGhhdCBpcyBiZWluZyBjcmVhdGVkLgogQHJldHVybiBUUlVFIGlmIHRoZSBvcGVyYXRp
b24gd2FzIGxvZ2dlZCBvciB0aGUgaW5kZXggY3JlYXRpb24gZmFpbGVkOwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYycKLS0tIGEvc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTIwNjE0MDY0OTI4LXY5ZjZhaXdzbGRlY3BtdHQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MG1lcmdlLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjE0MDgwOTA2
LW8zN2Ntbmk0djIzbXAwNXkKQEAgLTIyODQsMTkgKzIyODQsMjIgQEAgcm93X21lcmdlX2luc2Vy
dF9pbmRleF90dXBsZXMoCiAJCQkJYnJlYWs7CiAJCQl9CiAKLQkJCWlmIChkaWN0X2luZGV4X2lz
X2NsdXN0KGluZGV4KQotCQkJICAgICYmIGRpY3RfdGFibGVfaXNfb25saW5lX3JlYnVpbGQob2xk
X3RhYmxlKSkgeworCQkJaWYgKGRpY3RfaW5kZXhfaXNfY2x1c3QoaW5kZXgpKSB7CiAJCQkJY29u
c3QgZGljdF9pbmRleF90KglvbGRfaW5kZXgKIAkJCQkJPSBkaWN0X3RhYmxlX2dldF9maXJzdF9p
bmRleCgKIAkJCQkJCW9sZF90YWJsZSk7Ci0JCQkJZXJyb3IgPSByb3dfbG9nX3RhYmxlX2dldF9l
cnJvcihvbGRfaW5kZXgpOwotCQkJCWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7Ci0JCQkJCWJy
ZWFrOwotCQkJCX0KKwkJCQlpZiAoZGljdF9pbmRleF9pc19vbmxpbmVfZGRsKG9sZF9pbmRleCkp
IHsKKwkJCQkJZXJyb3IgPSByb3dfbG9nX3RhYmxlX2dldF9lcnJvcigKKwkJCQkJCW9sZF9pbmRl
eCk7CisJCQkJCWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7CisJCQkJCQlicmVhazsKKwkJCQkJ
fQogCi0JCQkJaWYgKHJvd19tZXJnZV9za2lwX3JlYyhtcmVjLCBpbmRleCwgb2xkX2luZGV4LAot
CQkJCQkJICAgICAgIG9mZnNldHMpKSB7Ci0JCQkJCWNvbnRpbnVlOworCQkJCQlpZiAocm93X21l
cmdlX3NraXBfcmVjKAorCQkJCQkJICAgIG1yZWMsIGluZGV4LCBvbGRfaW5kZXgsCisJCQkJCQkg
ICAgb2Zmc2V0cykpIHsKKwkJCQkJCWNvbnRpbnVlOworCQkJCQl9CiAJCQkJfQogCQkJfQogCgpO
byBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==