From: marko.makela Date: June 3 2012 8:01pm Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3931 to 3932) WL#6255 List-Archive: http://lists.mysql.com/commits/144190 Message-Id: <201206032001.q53K1Klt013158@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM5MzIgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0wMwogICAgICBXTCM2MjU1IGNsZWFudXAgaW4g cm93MCouY2M6IFJlbW92ZSB1bnVzZWQgcGFyYW1ldGVyIGFsdGVyZWRfdGFibGUuCgogICAgbW9k aWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAg ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwbG9nLmgKICAgICAgc3RvcmFnZS9pbm5v YmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBs b2cuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCiAzOTMxIE1hcmtv IE3DpGtlbMOkCTIwMTItMDYtMDIKICAgICAgV0wjNjI1NSBjbGVhbi11cC4KICAgICAgCiAgICAg IGlubm9iYXNlX2NvbnZlcnRfdGFibGVuYW1lKCk6IFJlcGxhY2Ugd2l0aCBpbm5vYmFzZV9jb252 ZXJ0X25hbWUoKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVy L2hhbmRsZXIwYWx0ZXIuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFu ZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFu ZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYwMjIwMDI1 MS02MG9zN3dnc2dxY2hpaTBrCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVy MGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjAzMTY0NjEyLWNk YzZqYmdxNmh2YzloN3cKQEAgLTMxNjUsOCArMzE2NSw3IEBAIG9rX2V4aXQ6CiAJCXByZWJ1aWx0 LT50cngsCiAJCXByZWJ1aWx0LT50YWJsZSwgY3R4LT5pbmRleGVkX3RhYmxlLAogCQljdHgtPm9u bGluZSwKLQkJY3R4LT5hZGQsIGN0eC0+YWRkX2tleV9udW1iZXJzLCBjdHgtPm51bV90b19hZGQs Ci0JCXRhYmxlLCBhbHRlcmVkX3RhYmxlKTsKKwkJY3R4LT5hZGQsIGN0eC0+YWRkX2tleV9udW1i ZXJzLCBjdHgtPm51bV90b19hZGQsIHRhYmxlKTsKICNpZm5kZWYgREJVR19PRkYKIG9vbToKICNl bmRpZiAvKiAhREJVR19PRkYgKi8KQEAgLTMxNzQsNyArMzE3Myw3IEBAIG9vbToKIAkgICAgJiYg Y3R4LT5pbmRleGVkX3RhYmxlICE9IHByZWJ1aWx0LT50YWJsZSkgewogCQlERUJVR19TWU5DX0Mo InJvd19sb2dfdGFibGVfYXBwbHkxX2JlZm9yZSIpOwogCQllcnJvciA9IHJvd19sb2dfdGFibGVf YXBwbHkoCi0JCQljdHgtPnRociwgcHJlYnVpbHQtPnRhYmxlLCB0YWJsZSwgYWx0ZXJlZF90YWJs ZSk7CisJCQljdHgtPnRociwgcHJlYnVpbHQtPnRhYmxlLCB0YWJsZSk7CiAJfQogCiAJLyogQWZ0 ZXIgYW4gZXJyb3IsIHJlbW92ZSBhbGwgdGhvc2UgaW5kZXggZGVmaW5pdGlvbnMKQEAgLTM3NTQs NyArMzc1Myw3IEBAIGhhX2lubm9iYXNlOjpjb21taXRfaW5wbGFjZV9hbHRlcl90YWJsZSgKIAkJ CURFQlVHX1NZTkNfQygicm93X2xvZ190YWJsZV9hcHBseTJfYmVmb3JlIik7CiAJCQllcnJvciA9 IHJvd19sb2dfdGFibGVfYXBwbHkoCiAJCQkJY3R4LT50aHIsIHByZWJ1aWx0LT50YWJsZSwKLQkJ CQl0YWJsZSwgYWx0ZXJlZF90YWJsZSk7CisJCQkJdGFibGUpOwogCiAJCQlzd2l0Y2ggKGVycm9y KSB7CiAJCQkJS0VZKglkdXBfa2V5OwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh c2UvaW5jbHVkZS9yb3cwbG9nLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cw bG9nLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MDIyMDAyNTEtNjBvczd3 Z3NncWNoaWkwaworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MGxvZy5oCXJldmlk Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjAzMTY0NjEyLWNkYzZqYmdxNmh2YzloN3cK QEAgLTE3NiwxMCArMTc2LDggQEAgcm93X2xvZ190YWJsZV9hcHBseSgKIAlxdWVfdGhyX3QqCXRo ciwJLyohPCBpbjogcXVlcnkgZ3JhcGggKi8KIAlkaWN0X3RhYmxlX3QqCW9sZF90YWJsZSwKIAkJ CQkvKiE8IGluOiBvbGQgdGFibGUgKi8KLQlzdHJ1Y3QgVEFCTEUqCXRhYmxlLAkvKiE8IGluL291 dDogTXlTUUwgdGFibGUKKwlzdHJ1Y3QgVEFCTEUqCXRhYmxlKQkvKiE8IGluL291dDogTXlTUUwg dGFibGUKIAkJCQkoZm9yIHJlcG9ydGluZyBkdXBsaWNhdGVzKSAqLwotCXN0cnVjdCBUQUJMRSoJ YWx0ZXJlZF90YWJsZSkKLQkJCQkvKiE8IGluOiBuZXcgTXlTUUwgdGFibGUgZGVmaW5pdGlvbiAq LwogCV9fYXR0cmlidXRlX18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwogCiAvKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgoK PT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwbWVyZ2UuaCcK LS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oCXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTIwNjAyMjAwMjUxLTYwb3M3d2dzZ3FjaGlpMGsKKysrIGIvc3Rv cmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj bGUuY29tLTIwMTIwNjAzMTY0NjEyLWNkYzZqYmdxNmh2YzloN3cKQEAgLTI5MCwxMSArMjkwLDkg QEAgcm93X21lcmdlX2J1aWxkX2luZGV4ZXMoCiAJZGljdF9pbmRleF90KioJaW5kZXhlcywJLyoh PCBpbjogaW5kZXhlcyB0byBiZSBjcmVhdGVkICovCiAJY29uc3QgdWxpbnQqCWtleV9udW1iZXJz LAkvKiE8IGluOiBNeVNRTCBrZXkgbnVtYmVycyAqLwogCXVsaW50CQluX2luZGV4ZXMsCS8qITwg aW46IHNpemUgb2YgaW5kZXhlc1tdICovCi0Jc3RydWN0IFRBQkxFKgl0YWJsZSwJCS8qITwgaW4v b3V0OiBNeVNRTCB0YWJsZSwgZm9yCisJc3RydWN0IFRBQkxFKgl0YWJsZSkJCS8qITwgaW4vb3V0 OiBNeVNRTCB0YWJsZSwgZm9yCiAJCQkJCXJlcG9ydGluZyBlcnJvbmVvdXMga2V5IHZhbHVlCiAJ CQkJCWlmIGFwcGxpY2FibGUgKi8KLQlzdHJ1Y3QgVEFCTEUqCWFsdGVyZWRfdGFibGUpCS8qITwg aW4vb3V0OiBuZXcgTXlTUUwgdGFibGUKLQkJCQkJZGVmaW5pdGlvbiAqLwogCV9fYXR0cmlidXRl X18oKG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpOwogLyoqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogV3Jp dGUgYSBidWZmZXIgdG8gYSBibG9jay4gKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu bm9iYXNlL3Jvdy9yb3cwbG9nLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbG9n LmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjAyMjAwMjUxLTYwb3M3d2dz Z3FjaGlpMGsKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJr by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYwMzE2NDYxMi1jZGM2amJncTZodmM5aDd3CkBAIC0x MDEyLDggKzEwMTIsNiBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2NvbnZlcnRfbXJlYygKIAltZW1f aGVhcF90KgkJaGVhcCwJCS8qITwgaW4vb3V0OiBtZW1vcnkgaGVhcCAqLwogCWRpY3RfdGFibGVf dCoJCW5ld190YWJsZSwJLyohPCBpbi9vdXQ6IHRhYmxlCiAJCQkJCQliZWluZyByZWJ1aWx0ICov Ci0JY29uc3Qgc3RydWN0IFRBQkxFKglhbHRlcmVkX3RhYmxlLAkvKiE8IGluOiBuZXcgTXlTUUwK LQkJCQkJCXRhYmxlIGRlZmluaXRpb24gKi8KIAlkYmVycl90KgkJZXJyb3IpCQkvKiE8IG91dDog REJfU1VDQ0VTUyBvcgogCQkJCQkJcmVhc29uIG9mIGZhaWx1cmUgKi8KIHsKQEAgLTExMDQsOCAr MTEwMiw2IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfaW5zZXJ0X2xvdygKIAltZW1faGVhcF90KgkJ aGVhcCwJCS8qITwgaW4vb3V0OiBtZW1vcnkgaGVhcCAqLwogCWRpY3RfdGFibGVfdCoJCW5ld190 YWJsZSwJLyohPCBpbi9vdXQ6IHRhYmxlCiAJCQkJCQliZWluZyByZWJ1aWx0ICovCi0JY29uc3Qg c3RydWN0IFRBQkxFKglhbHRlcmVkX3RhYmxlLAkvKiE8IGluOiBuZXcgTXlTUUwKLQkJCQkJCXRh YmxlIGRlZmluaXRpb24gKi8KIAlyb3dfbWVyZ2VfZHVwX3QqCWR1cCkJCS8qITwgaW4vb3V0OiBm b3IgcmVwb3J0aW5nCiAJCQkJCQlkdXBsaWNhdGUga2V5IGVycm9ycyAqLwogewpAQCAtMTE3Mywy MiArMTE2OSwxOSBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2luc2VydCgKIAltZW1faGVhcF90KgkJ aGVhcCwJCS8qITwgaW4vb3V0OiBtZW1vcnkgaGVhcCAqLwogCWRpY3RfdGFibGVfdCoJCW5ld190 YWJsZSwJLyohPCBpbi9vdXQ6IHRhYmxlCiAJCQkJCQliZWluZyByZWJ1aWx0ICovCi0JY29uc3Qg c3RydWN0IFRBQkxFKglhbHRlcmVkX3RhYmxlLAkvKiE8IGluOiBuZXcgTXlTUUwKLQkJCQkJCXRh YmxlIGRlZmluaXRpb24gKi8KIAlyb3dfbWVyZ2VfZHVwX3QqCWR1cCkJCS8qITwgaW4vb3V0OiBm b3IgcmVwb3J0aW5nCiAJCQkJCQlkdXBsaWNhdGUga2V5IGVycm9ycyAqLwogewogCWRiZXJyX3QJ CWVycm9yOwogCWNvbnN0IGR0dXBsZV90Kglyb3cJPSByb3dfbG9nX3RhYmxlX2FwcGx5X2NvbnZl cnRfbXJlYygKLQkJbXJlYywgZHVwLT5pbmRleCwgb2Zmc2V0cywgaGVhcCwgbmV3X3RhYmxlLCBh bHRlcmVkX3RhYmxlLAorCQltcmVjLCBkdXAtPmluZGV4LCBvZmZzZXRzLCBoZWFwLCBuZXdfdGFi bGUsCiAJCSZlcnJvcik7CiAKIAl1dF9hZCghcm93ID09IChlcnJvciAhPSBEQl9TVUNDRVNTKSk7 CiAKIAlpZiAocm93KSB7CiAJCWVycm9yID0gcm93X2xvZ190YWJsZV9hcHBseV9pbnNlcnRfbG93 KAotCQkJdGhyLCByb3csIG9mZnNldHNfaGVhcCwgaGVhcCwKLQkJCW5ld190YWJsZSwgYWx0ZXJl ZF90YWJsZSwgZHVwKTsKKwkJCXRociwgcm93LCBvZmZzZXRzX2hlYXAsIGhlYXAsIG5ld190YWJs ZSwgZHVwKTsKIAl9CiAKIAlpZiAoZXJyb3IgIT0gREJfU1VDQ0VTUykgewpAQCAtMTQwMyw4ICsx Mzk2LDYgQEAgcm93X2xvZ190YWJsZV9hcHBseV91cGRhdGUoCiAJbWVtX2hlYXBfdCoJCWhlYXAs CQkvKiE8IGluL291dDogbWVtb3J5IGhlYXAgKi8KIAlkaWN0X3RhYmxlX3QqCQluZXdfdGFibGUs CS8qITwgaW4vb3V0OiB0YWJsZQogCQkJCQkJYmVpbmcgcmVidWlsdCAqLwotCWNvbnN0IHN0cnVj dCBUQUJMRSoJYWx0ZXJlZF90YWJsZSwJLyohPCBpbjogbmV3IE15U1FMCi0JCQkJCQl0YWJsZSBk ZWZpbml0aW9uICovCiAJcm93X21lcmdlX2R1cF90KglkdXAsCQkvKiE8IGluL291dDogZm9yIHJl cG9ydGluZwogCQkJCQkJZHVwbGljYXRlIGtleSBlcnJvcnMgKi8KIAljb25zdCBkdHVwbGVfdCoJ CW9sZF9waykJCS8qITwgaW46IFBSSU1BUlkgS0VZIGFuZApAQCAtMTQyNSw4ICsxNDE2LDcgQEAg cm93X2xvZ190YWJsZV9hcHBseV91cGRhdGUoCiAJICAgICAgKyAoZHVwLT5pbmRleC0+b25saW5l X2xvZy0+c2FtZV9wayA/IDAgOiAyKSk7CiAKIAlyb3cgPSByb3dfbG9nX3RhYmxlX2FwcGx5X2Nv bnZlcnRfbXJlYygKLQkJbXJlYywgZHVwLT5pbmRleCwgb2Zmc2V0cywgaGVhcCwKLQkJbmV3X3Rh YmxlLCBhbHRlcmVkX3RhYmxlLCAmZXJyb3IpOworCQltcmVjLCBkdXAtPmluZGV4LCBvZmZzZXRz LCBoZWFwLCBuZXdfdGFibGUsICZlcnJvcik7CiAKIAl1dF9hZCghcm93ID09IChlcnJvciAhPSBE Ql9TVUNDRVNTKSk7CiAKQEAgLTE0NTcsOCArMTQ0Nyw3IEBAIHJvd19sb2dfdGFibGVfYXBwbHlf dXBkYXRlKAogaW5zZXJ0OgogCQkvKiBUaGUgcm93IHdhcyBub3QgZm91bmQuIEluc2VydCBpdC4g Ki8KIAkJZXJyb3IgPSByb3dfbG9nX3RhYmxlX2FwcGx5X2luc2VydF9sb3coCi0JCQl0aHIsIHJv dywgb2Zmc2V0c19oZWFwLCBoZWFwLAotCQkJbmV3X3RhYmxlLCBhbHRlcmVkX3RhYmxlLCBkdXAp OworCQkJdGhyLCByb3csIG9mZnNldHNfaGVhcCwgaGVhcCwgbmV3X3RhYmxlLCBkdXApOwogCiAJ CWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7CiBlcnJfZXhpdDoKQEAgLTE2NTgsOCArMTY0Nyw2 IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfb3AoCiAJCQkJCQlEQl9UUlhfSUQgaW4gbmV3IGluZGV4 ICovCiAJZGljdF90YWJsZV90KgkJbmV3X3RhYmxlLAkvKiE8IGluL291dDogdGFibGUKIAkJCQkJ CWJlaW5nIHJlYnVpbHQgKi8KLQljb25zdCBzdHJ1Y3QgVEFCTEUqCWFsdGVyZWRfdGFibGUsCS8q ITwgaW46IG5ldyBNeVNRTAotCQkJCQkJdGFibGUgZGVmaW5pdGlvbiAqLwogCXJvd19tZXJnZV9k dXBfdCoJZHVwLAkJLyohPCBpbi9vdXQ6IGZvciByZXBvcnRpbmcKIAkJCQkJCWR1cGxpY2F0ZSBr ZXkgZXJyb3JzICovCiAJZGJlcnJfdCoJCWVycm9yLAkJLyohPCBvdXQ6IERCX1NVQ0NFU1MKQEAg LTE3MjUsOCArMTcxMiw3IEBAIHJvd19sb2dfdGFibGVfYXBwbHlfb3AoCiAJCQkJICAgIHRyeF9y ZWFkX3RyeF9pZChkYl90cnhfaWQpKSkgewogCQkJCSplcnJvciA9IHJvd19sb2dfdGFibGVfYXBw bHlfaW5zZXJ0KAogCQkJCQl0aHIsIG1yZWMsIG9mZnNldHMsIG9mZnNldHNfaGVhcCwKLQkJCQkJ aGVhcCwKLQkJCQkJbmV3X3RhYmxlLCBhbHRlcmVkX3RhYmxlLCBkdXApOworCQkJCQloZWFwLCBu ZXdfdGFibGUsIGR1cCk7CiAJCQl9CiAJCX0KIAkJYnJlYWs7CkBAIC0xODk2LDcgKzE4ODIsNyBA QCByb3dfbG9nX3RhYmxlX2FwcGx5X29wKAogCQkJCSplcnJvciA9IHJvd19sb2dfdGFibGVfYXBw bHlfdXBkYXRlKAogCQkJCQl0aHIsIHRyeF9pZF9jb2wsIG5ld190cnhfaWRfY29sLAogCQkJCQlt cmVjLCBvZmZzZXRzLCBvZmZzZXRzX2hlYXAsIGhlYXAsCi0JCQkJCW5ld190YWJsZSwgYWx0ZXJl ZF90YWJsZSwgZHVwLCBvbGRfcGspOworCQkJCQluZXdfdGFibGUsIGR1cCwgb2xkX3BrKTsKIAkJ CX0KIAkJfQogCkBAIC0xOTE2LDggKzE5MDIsNiBAQCBkYmVycl90CiByb3dfbG9nX3RhYmxlX2Fw cGx5X29wcygKIC8qPT09PT09PT09PT09PT09PT09PT0qLwogCXF1ZV90aHJfdCoJdGhyLAkvKiE8 IGluOiBxdWVyeSBncmFwaCAqLwotCXN0cnVjdCBUQUJMRSoJYWx0ZXJlZF90YWJsZSwKLQkJCQkv KiE8IGluOiBuZXcgTXlTUUwgdGFibGUgZGVmaW5pdGlvbiAqLwogCXJvd19tZXJnZV9kdXBfdCpk dXApCS8qITwgaW4vb3V0OiBmb3IgcmVwb3J0aW5nIGR1cGxpY2F0ZSBrZXkKIAkJCQllcnJvcnMg Ki8KIHsKQEAgLTIwOTIsNyArMjA3Niw3IEBAIGFsbF9kb25lOgogCQkgICAgICAgKCZpbmRleC0+ b25saW5lX2xvZy0+aGVhZC5idWYpWzFdIC0gbXJlY19lbmQpOwogCQltcmVjID0gcm93X2xvZ190 YWJsZV9hcHBseV9vcCgKIAkJCXRociwgdHJ4X2lkX2NvbCwgbmV3X3RyeF9pZF9jb2wsCi0JCQlp bmRleC0+b25saW5lX2xvZy0+dGFibGUsIGFsdGVyZWRfdGFibGUsCisJCQlpbmRleC0+b25saW5l X2xvZy0+dGFibGUsCiAJCQlkdXAsICZlcnJvciwgb2Zmc2V0c19oZWFwLCBoZWFwLAogCQkJaW5k ZXgtPm9ubGluZV9sb2ctPmhlYWQuYnVmLAogCQkJKCZpbmRleC0+b25saW5lX2xvZy0+aGVhZC5i dWYpWzFdLCBvZmZzZXRzKTsKQEAgLTIxOTEsNyArMjE3NSw3IEBAIGFsbF9kb25lOgogCiAJCW5l eHRfbXJlYyA9IHJvd19sb2dfdGFibGVfYXBwbHlfb3AoCiAJCQl0aHIsIHRyeF9pZF9jb2wsIG5l d190cnhfaWRfY29sLAotCQkJaW5kZXgtPm9ubGluZV9sb2ctPnRhYmxlLCBhbHRlcmVkX3RhYmxl LAorCQkJaW5kZXgtPm9ubGluZV9sb2ctPnRhYmxlLAogCQkJZHVwLCAmZXJyb3IsIG9mZnNldHNf aGVhcCwgaGVhcCwKIAkJCW1yZWMsIG1yZWNfZW5kLCBvZmZzZXRzKTsKIApAQCAtMjI1OCwxMCAr MjI0Miw4IEBAIHJvd19sb2dfdGFibGVfYXBwbHkoCiAJcXVlX3Rocl90Kgl0aHIsCS8qITwgaW46 IHF1ZXJ5IGdyYXBoICovCiAJZGljdF90YWJsZV90KglvbGRfdGFibGUsCiAJCQkJLyohPCBpbjog b2xkIHRhYmxlICovCi0Jc3RydWN0IFRBQkxFKgl0YWJsZSwJLyohPCBpbi9vdXQ6IE15U1FMIHRh YmxlCisJc3RydWN0IFRBQkxFKgl0YWJsZSkJLyohPCBpbi9vdXQ6IE15U1FMIHRhYmxlCiAJCQkJ KGZvciByZXBvcnRpbmcgZHVwbGljYXRlcykgKi8KLQlzdHJ1Y3QgVEFCTEUqCWFsdGVyZWRfdGFi bGUpCi0JCQkJLyohPCBpbjogbmV3IE15U1FMIHRhYmxlIGRlZmluaXRpb24gKi8KIHsKIAlkYmVy cl90CQllcnJvcjsKIAlkaWN0X2luZGV4X3QqCWNsdXN0X2luZGV4OwpAQCAtMjI4OCw4ICsyMjcw LDcgQEAgcm93X2xvZ190YWJsZV9hcHBseSgKIAkJdXRfYWQoMCk7CiAJCWVycm9yID0gREJfRVJS T1I7CiAJfSBlbHNlIHsKLQkJZXJyb3IgPSByb3dfbG9nX3RhYmxlX2FwcGx5X29wcygKLQkJCXRo ciwgYWx0ZXJlZF90YWJsZSwgJmR1cCk7CisJCWVycm9yID0gcm93X2xvZ190YWJsZV9hcHBseV9v cHModGhyLCAmZHVwKTsKIAl9CiAKIAlyd19sb2NrX3hfdW5sb2NrKGRpY3RfaW5kZXhfZ2V0X2xv Y2soY2x1c3RfaW5kZXgpKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jv dy9yb3cwbWVyZ2UuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwly ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYwMjIwMDI1MS02MG9zN3dnc2dxY2hp aTBrCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwlyZXZpZDptYXJrby5t YWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYwMzE2NDYxMi1jZGM2amJncTZodmM5aDd3CkBAIC0zMjMx LDExICszMjMxLDkgQEAgcm93X21lcmdlX2J1aWxkX2luZGV4ZXMoCiAJZGljdF9pbmRleF90KioJ aW5kZXhlcywJLyohPCBpbjogaW5kZXhlcyB0byBiZSBjcmVhdGVkICovCiAJY29uc3QgdWxpbnQq CWtleV9udW1iZXJzLAkvKiE8IGluOiBNeVNRTCBrZXkgbnVtYmVycyAqLwogCXVsaW50CQluX2lu ZGV4ZXMsCS8qITwgaW46IHNpemUgb2YgaW5kZXhlc1tdICovCi0Jc3RydWN0IFRBQkxFKgl0YWJs ZSwJCS8qITwgaW4vb3V0OiBNeVNRTCB0YWJsZSwgZm9yCisJc3RydWN0IFRBQkxFKgl0YWJsZSkJ CS8qITwgaW4vb3V0OiBNeVNRTCB0YWJsZSwgZm9yCiAJCQkJCXJlcG9ydGluZyBlcnJvbmVvdXMg a2V5IHZhbHVlCiAJCQkJCWlmIGFwcGxpY2FibGUgKi8KLQlzdHJ1Y3QgVEFCTEUqCWFsdGVyZWRf dGFibGUpCS8qITwgaW4vb3V0OiBuZXcgTXlTUUwgdGFibGUKLQkJCQkJZGVmaW5pdGlvbiAqLwog ewogCW1lcmdlX2ZpbGVfdCoJCW1lcmdlX2ZpbGVzOwogCXJvd19tZXJnZV9ibG9ja190KglibG9j azsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku