From: marko.makela
Date: May 16 2012 11:22am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3837 to 3838) WL#6255
List-Archive: http://lists.mysql.com/commits/143833
Message-Id: <201205161122.q4GBMJw5006424@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MzggTWFya28gTcOka2Vsw6QJMjAxMi0wNS0xNgogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
OiBBZGQgcm9sbGJhY2sgYXNzZXJ0aW9ucyBvbiBEQl9UUlhfSUQgPT0gdHJ4LT5pZC4KICAgICAg
CiAgICAgIHJlY19nZXRfdHJ4X2lkKCk6IE5ldyBmdW5jdGlvbiwgYXZhaWxhYmxlIGluIGRlYnVn
IGJ1aWxkcy4KICAgICAgCiAgICAgIHJvd191bmRvX2luc19yZW1vdmVfY2x1c3RfcmVjKCksIHJv
d191bmRvX21vZF9jbHVzdF9sb3coKTogQXNzZXJ0IHRoYXQKICAgICAgcmVjX2dldF90cnhfaWQo
KSBtYXRjaGVzIHRyeC0+aWQuCiAgICAgIAogICAgICByb3dfdW5kb19tb2RfcmVtb3ZlX2NsdXN0
X2xvdygpOiBBc3NlcnQgdGhhdCByZWNfZ2V0X3RyeF9pZCgpIG1hdGNoZXMKICAgICAgdHJ4LT5p
ZCBhbmQgdGhlIHJlY29yZCBpcyBub3QgZGVsZXRlLW1hcmtlZCwgb3IgdGhlIHRyYW5zYWN0aW9u
IGlzCiAgICAgIFRSWF9ESUNUX09QX1RBQkxFLiAgRm9yIHNvbWUgcmVhc29uLCB0aGVzZSBhc3Nl
cnRpb25zIHdvdWxkIGZhaWwgZHVyaW5nCiAgICAgIGEgcm9sbGJhY2sgaW4gQUREIEZPUkVJR04g
S0VZIChpbm5vZGItaW5kZXgudGVzdCwgaW5ub2RiXzE2ay50ZXN0KS4KCiAgICBtb2RpZmllZDoK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaAogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3JlbS9yZW0wcmVjLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1aW5z
LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1bW9kLmNjCiAzODM3IE1hcmtvIE3D
pGtlbMOkCTIwMTItMDUtMTUKICAgICAgZGljdF9pbmRleF9zZXRfb25saW5lX3N0YXR1cygpOiBB
c3NlcnQgdGhhdCBpdCBpcyBub3QgYSBmdWxsdGV4dCBpbmRleC4KCiAgICBtb2RpZmllZDoKICAg
ICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5pYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JlbTByZWMuaCcKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL3JlbTByZWMuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEy
MDUxNTE5NDYxMS0xMW02czUwcGVzeXlhZ2YxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk
ZS9yZW0wcmVjLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MTYxMTIxMTkt
MGhubTg2cjg4N2Zjdmo1YwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgog
Ci1Db3B5cmlnaHQgKGMpIDE5OTQsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMu
IEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTQsIDIwMTIsIE9yYWNsZSBh
bmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMgcHJvZ3Jh
bSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5
IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFz
IHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNDIwLDggKzQyMCw5IEBAIHJlY19v
ZmZzX21ha2VfdmFsaWQoCiAvKj09PT09PT09PT09PT09PT0qLwogCWNvbnN0IHJlY190KgkJcmVj
LAkvKiE8IGluOiByZWNvcmQgKi8KIAljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGlu
OiByZWNvcmQgZGVzY3JpcHRvciAqLwotCXVsaW50KgkJCW9mZnNldHMpOy8qITwgaW46IGFycmF5
IHJldHVybmVkIGJ5CisJdWxpbnQqCQkJb2Zmc2V0cykvKiE8IGluOiBhcnJheSByZXR1cm5lZCBi
eQogCQkJCQlyZWNfZ2V0X29mZnNldHMoKSAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwpKTsK
ICNlbHNlCiAjIGRlZmluZSByZWNfb2Zmc19tYWtlX3ZhbGlkKHJlYywgaW5kZXgsIG9mZnNldHMp
ICgodm9pZCkgMCkKICNlbmRpZiAvKiBVTklWX0RFQlVHICovCkBAIC04MzYsNiArODM3LDE5IEBA
IHJlY19wcmludCgKIAlGSUxFKgkJCWZpbGUsCS8qITwgaW46IGZpbGUgd2hlcmUgdG8gcHJpbnQg
Ki8KIAljb25zdCByZWNfdCoJCXJlYywJLyohPCBpbjogcGh5c2ljYWwgcmVjb3JkICovCiAJY29u
c3QgZGljdF9pbmRleF90KglpbmRleCk7CS8qITwgaW46IHJlY29yZCBkZXNjcmlwdG9yICovCisK
KyMgaWZkZWYgVU5JVl9ERUJVRworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK1JlYWRzIHRoZSBEQl9UUlhfSUQgb2YgYSBj
bHVzdGVyZWQgaW5kZXggcmVjb3JkLgorQHJldHVybgl0aGUgdmFsdWUgb2YgREJfVFJYX0lEICov
CitVTklWX0lOVEVSTgordHJ4X2lkX3QKK3JlY19nZXRfdHJ4X2lkKAorLyo9PT09PT09PT09PSov
CisJY29uc3QgcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAqLworCWNvbnN0IGRpY3RfaW5k
ZXhfdCoJaW5kZXgpCS8qITwgaW46IGNsdXN0ZXJlZCBpbmRleCAqLworCV9fYXR0cmlidXRlX18o
KG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOworIyBlbmRpZiAvKiBVTklWX0RFQlVHICov
CiAjZW5kaWYgLyogVU5JVl9IT1RCQUNLVVAgKi8KIAogLyogTWF4aW11bSBsZW5ndGhzIGZvciB0
aGUgZGF0YSBpbiBhIHBoeXNpY2FsIHJlY29yZCBpZiB0aGUgb2Zmc2V0cwoKPT09IG1vZGlmaWVk
IGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvcmVtL3JlbTByZWMuY2MnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvcmVtL3JlbTByZWMuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1
MTUxOTQ2MTEtMTFtNnM1MHBlc3l5YWdmMQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3JlbS9yZW0w
cmVjLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTE2MTEyMTE5LTBobm04
NnI4ODdmY3ZqNWMKQEAgLTEsNiArMSw2IEBACiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKIAotQ29w
eXJpZ2h0IChjKSAxOTk0LCAyMDExLCBPcmFjbGUgYW5kL29yIGl0cyBhZmZpbGlhdGVzLiBBbGwg
UmlnaHRzIFJlc2VydmVkLgorQ29weXJpZ2h0IChjKSAxOTk0LCAyMDEyLCBPcmFjbGUgYW5kL29y
IGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogCiBUaGlzIHByb2dyYW0gaXMg
ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1
bmRlcgogdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJs
aXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKQEAgLTI5LDYgKzI5LDcgQEAgQ3JlYXRlZCA1LzMw
LzE5OTQgSGVpa2tpIFR1dXJpCiAjaW5jbHVkZSAicmVtMHJlYy5pYyIKICNlbmRpZgogCisjaW5j
bHVkZSAicGFnZTBwYWdlLmgiCiAjaW5jbHVkZSAibXRyMG10ci5oIgogI2luY2x1ZGUgIm10cjBs
b2cuaCIKICNpbmNsdWRlICJmdHMwZnRzLmgiCkBAIC0xNzkyLDQgKzE3OTMsNTAgQEAgcmVjX3By
aW50KAogCQl9CiAJfQogfQorCisjIGlmZGVmIFVOSVZfREVCVUcKKy8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCitSZWFkcyB0
aGUgREJfVFJYX0lEIG9mIGEgY2x1c3RlcmVkIGluZGV4IHJlY29yZC4KK0ByZXR1cm4JdGhlIHZh
bHVlIG9mIERCX1RSWF9JRCAqLworVU5JVl9JTlRFUk4KK3RyeF9pZF90CityZWNfZ2V0X3RyeF9p
ZCgKKy8qPT09PT09PT09PT0qLworCWNvbnN0IHJlY190KgkJcmVjLAkvKiE8IGluOiByZWNvcmQg
Ki8KKwljb25zdCBkaWN0X2luZGV4X3QqCWluZGV4KQkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXgg
Ki8KK3sKKwljb25zdCBwYWdlX3QqCXBhZ2UKKwkJPSBwYWdlX2FsaWduKHJlYyk7CisJdWxpbnQJ
CXRyeF9pZF9jb2wKKwkJPSBkaWN0X2luZGV4X2dldF9zeXNfY29sX3BvcyhpbmRleCwgREFUQV9U
UlhfSUQpOworCWNvbnN0IGJ5dGUqCXRyeF9pZDsKKwl1bGludAkJbGVuOworCW1lbV9oZWFwX3Qq
CWhlYXAJCT0gTlVMTDsKKwl1bGludAkJb2Zmc2V0c19bUkVDX09GRlNfTk9STUFMX1NJWkVdOwor
CXVsaW50KgkJb2Zmc2V0cwkJPSBvZmZzZXRzXzsKKwlyZWNfb2Zmc19pbml0KG9mZnNldHNfKTsK
KworCXV0X2FkKGZpbF9wYWdlX2dldF90eXBlKHBhZ2UpID09IEZJTF9QQUdFX0lOREVYKTsKKwl1
dF9hZChtYWNoX3JlYWRfZnJvbV84KHBhZ2UgKyBQQUdFX0hFQURFUiArIFBBR0VfSU5ERVhfSUQp
CisJICAgICAgPT0gaW5kZXgtPmlkKTsKKwl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGluZGV4
KSk7CisJdXRfYWQodHJ4X2lkX2NvbCA+IDApOworCXV0X2FkKHRyeF9pZF9jb2wgIT0gVUxJTlRf
VU5ERUZJTkVEKTsKKworCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgb2Zm
c2V0cywgdHJ4X2lkX2NvbCArIDEsICZoZWFwKTsKKworCXRyeF9pZCA9IHJlY19nZXRfbnRoX2Zp
ZWxkKHJlYywgb2Zmc2V0cywgdHJ4X2lkX2NvbCwgJmxlbik7CisKKwl1dF9hZChsZW4gPT0gREFU
QV9UUlhfSURfTEVOKTsKKyMgIGlmIERBVEFfVFJYX0lEX0xFTiAhPSA2CisjICAgZXJyb3IKKyMg
IGVuZGlmCisKKwlpZiAoaGVhcCkgeworCQltZW1faGVhcF9mcmVlKGhlYXApOworCX0KKworCXJl
dHVybihtYWNoX3JlYWRfZnJvbV82KHRyeF9pZCkpOworfQorIyBlbmRpZiAvKiBVTklWX0RFQlVH
ICovCiAjZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vYmFzZS9yb3cvcm93MHVpbnMuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93
L3JvdzB1aW5zLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTE1MTk0NjEx
LTExbTZzNTBwZXN5eWFnZjEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVpbnMuY2MJ
cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MTYxMTIxMTktMGhubTg2cjg4N2Zj
dmo1YwpAQCAtNzgsNiArNzgsMTAgQEAgcm93X3VuZG9faW5zX3JlbW92ZV9jbHVzdF9yZWMoCiAJ
CQkJCSAgICAmbXRyKTsKIAl1dF9hKHN1Y2Nlc3MpOwogCisJdXRfYWQocmVjX2dldF90cnhfaWQo
YnRyX3BjdXJfZ2V0X3JlYygmbm9kZS0+cGN1ciksCisJCQkgICAgIG5vZGUtPnBjdXIuYnRyX2N1
ci5pbmRleCkKKwkgICAgICA9PSBub2RlLT50cngtPmlkKTsKKwogCWlmIChub2RlLT50YWJsZS0+
aWQgPT0gRElDVF9JTkRFWEVTX0lEKSB7CiAJCXV0X2FkKG5vZGUtPnRyeC0+ZGljdF9vcGVyYXRp
b25fbG9ja19tb2RlID09IFJXX1hfTEFUQ0gpOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzB1bW9kLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTE1MTk0NjExLTEx
bTZzNTBwZXN5eWFnZjEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2QuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MTYxMTIxMTktMGhubTg2cjg4N2Zjdmo1
YwpAQCAtMTI4LDYgKzEyOCwxMCBAQCByb3dfdW5kb19tb2RfY2x1c3RfbG93KAogCiAJdXRfYWQo
c3VjY2Vzcyk7CiAKKwl1dF9hZChyZWNfZ2V0X3RyeF9pZChidHJfY3VyX2dldF9yZWMoYnRyX2N1
ciksCisJCQkgICAgIGJ0cl9jdXJfZ2V0X2luZGV4KGJ0cl9jdXIpKQorCSAgICAgID09IHRocl9n
ZXRfdHJ4KHRociktPmlkKTsKKwogCWlmIChtb2RlID09IEJUUl9NT0RJRllfTEVBRikgewogCiAJ
CWVyciA9IGJ0cl9jdXJfb3B0aW1pc3RpY191cGRhdGUoQlRSX05PX0xPQ0tJTkdfRkxBRwpAQCAt
MTkwLDYgKzE5NCwxNyBAQCByb3dfdW5kb19tb2RfcmVtb3ZlX2NsdXN0X2xvdygKIAogCWJ0cl9j
dXIgPSBidHJfcGN1cl9nZXRfYnRyX2N1cigmbm9kZS0+cGN1cik7CiAKKwl1dF9hZChyZWNfZ2V0
X3RyeF9pZChidHJfY3VyX2dldF9yZWMoYnRyX2N1ciksCisJCQkgICAgIGJ0cl9jdXJfZ2V0X2lu
ZGV4KGJ0cl9jdXIpKQorCSAgICAgID09IHRocl9nZXRfdHJ4KHRociktPmlkCisJICAgICAgLyog
VE9ETzogd2h5IGlzIHRoZSBiZWxvdyBuZWVkZWQ/CisJICAgICAgaW5ub2RiLmlubm9kYi1pbmRl
eCBpbm5vZGIuaW5ub2RiXzE2ayBmYWlscyBvdGhlcndpc2UgKi8KKwkgICAgICB8fCB0aHJfZ2V0
X3RyeCh0aHIpLT5kaWN0X29wZXJhdGlvbiA9PSBUUlhfRElDVF9PUF9UQUJMRSk7CisJdXRfYWQo
IXJlY19nZXRfZGVsZXRlZF9mbGFnKGJ0cl9jdXJfZ2V0X3JlYyhidHJfY3VyKSwKKwkJCQkgICAg
ZGljdF90YWJsZV9pc19jb21wKG5vZGUtPnRhYmxlKSkKKwkgICAgICAvKiBUT0RPOiByZW1vdmUg
dGhlIGJlbG93ICovCisJICAgICAgfHwgdGhyX2dldF90cngodGhyKS0+ZGljdF9vcGVyYXRpb24g
PT0gVFJYX0RJQ1RfT1BfVEFCTEUpOworCiAJaWYgKG1vZGUgPT0gQlRSX01PRElGWV9MRUFGKSB7
CiAJCWVyciA9IGJ0cl9jdXJfb3B0aW1pc3RpY19kZWxldGUoYnRyX2N1ciwgMCwgbXRyKQogCQkJ
PyBEQl9TVUNDRVNTCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMp
Lg==