From: marko.makela Date: May 20 2010 11:44am Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3107 to 3108) List-Archive: http://lists.mysql.com/commits/108772 Message-Id: <201005201144.o4KBOJhc004639@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0109818431==" --===============0109818431== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDMxMDggTWFya28gTcOka2Vsw6QJMjAxMC0wNS0yMAogICAgICBNZXJnZSBhIGNoYW5nZSBmcm9t IG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICBUTyBETzogRW5hYmxlIHRoaXMgaW4gQ01h a2UtYmFzZWQgYnVpbGRzLgogICAgICAKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAzNDc0CiAgICAg IHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDEwNDA0Mi1tYTJu c3NjcWR2d29waDhrCiAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1 MTkwODE2MTgtaDM4cTAycXh1dmNvd2J0awogICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtlbMOk IDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6IDUuMS1pbm5vZGIK ICAgICAgdGltZXN0YW1wOiBUaHUgMjAxMC0wNS0yMCAxMzo0MDo0MiArMDMwMAogICAgICBtZXNz YWdlOgogICAgICAgIEJ1ZyM1MzU5MzogQWRkIHNvbWUgaW5zdHJ1bWVudGF0aW9uIHRvIGltcHJv dmUgVmFsZ3JpbmQgc2Vuc2l0aXZpdHkKICAgICAgCiAgICAgICAgQlVJTEQvKjogQWRkIHZhbGdy aW5kX2NvbmZpZ3M9LS13aXRoLXZhbGdyaW5kLgogICAgICAgIEJVSUxELyo6IFJlbW92ZSAtVVNB RkVNQUxMT0MgZnJvbSB2YWxncmluZF9mbGFncy4KICAgICAgCiAgICAgICAgY29uZmlndXJlLmlu OiBBZGQgQUNfQVJHX1dJVEgodmFsZ3JpbmQpIGFuZCBIQVZFX1ZBTEdSSU5ELgogICAgICAKICAg ICAgICBpbmNsdWRlL215X3N5cy5oOiBEZWZpbmUgYSBudW1iZXIgb2YgTUVNXyB3cmFwcGVycyBm b3IgVkFMR1JJTkRfIGZ1bmN0aW9ucy4KICAgICAgICBpbmNsdWRlL215X3N5cy5oOiBNYWtlIFRS QVNIIGRvIE1FTV9VTkRFRklORUQoKS4KICAgICAgCiAgICAgICAgaW5jbHVkZS9tX3N0cmluZy5o OiBSZW1vdmUgdW51c2VkIG1hY3JvIGJ6ZXJvX2lmX3B1cmlmeShBLEIpLgogICAgICAKICAgICAg ICBfbXltYWxsb2MoKTogRGVjbGFyZSBNRU1fVU5ERUZJTkVEKCkgb24gdGhlIGFsbG9jYXRlZCBt ZW1vcnkuCiAgICAgIAogICAgICAgIF9teWZyZWUoKTogRGVjbGFyZSBNRU1fTk9BQ0NFU1MoKSBv biB0aGUgZnJlZWQgbWVtb3J5LgogICAgICAKICAgICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1 ZGUvdW5pdi5pOiBFbmFibGUgVU5JVl9ERUJVR19WQUxHUklORCBiYXNlZCBvbgogICAgICAgIEhB VkVfVkFMR1JJTkQgcmF0aGVyIHRoYW4gSEFWRV9wdXJpZnkuCiAgICAgIAogICAgICAgIFBvc3Np YmxlIHRoaW5ncyB0byBkbzoKICAgICAgICAgKiBJbiBteV9nbG9iYWwuaCwgcmVtb3ZlIHRoZSBk ZWZpbmVkKEhBVkVfcHVyaWZ5KSBjb25kaXRpb24KICAgICAgICAgICBmcm9tIHRoZSBfV0lOMzIg dWludDNrb3JyKCkuCiAgICAgICAgICogSW4gbXlfZ2xvYmFsLmggKmludCprb3JyKCksIHVzZSB8 IGluc3RlYWQgb2YgKwogICAgICAgICAgIGluIG9yZGVyIHRvIGtlZXAgdGhlIFZhbGdyaW5kIFYg Yml0cyBhY2N1cmF0ZQogICAgICAgICAqIENvbnNpZGVyIHJlcGxhY2luZyBIQVZFX3B1cmlmeSB3 aXRoIEhBVkVfVkFMR1JJTkQKICAgICAgICAgKiBVc2UgVkFMR1JJTkRfQ1JFQVRFX0JMT0NLLCBW QUxHUklORF9ESVNDQVJEIGluIG1lbV9yb290IGFuZCBzaW1pbGFyIHBsYWNlcwoKICAgIG1vZGlm aWVkOgogICAgICBCVUlMRC9TRVRVUC5zaAogICAgICBCVUlMRC9idWlsZF9tY2NnZS5zaAogICAg ICBCVUlMRC9jb21waWxlLWFtZDY0LXZhbGdyaW5kLW1heAogICAgICBCVUlMRC9jb21waWxlLXBl bnRpdW0taWNjLXZhbGdyaW5kLW1heAogICAgICBCVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3Jp bmQtbWF4CiAgICAgIEJVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiCiAg ICAgIEJVSUxEL2NvbXBpbGUtcGVudGl1bTY0LXZhbGdyaW5kLW1heAogICAgICBjb25maWd1cmUu aW4KICAgICAgaW5jbHVkZS9tX3N0cmluZy5oCiAgICAgIGluY2x1ZGUvbXlfc3lzLmgKICAgICAg bXlzeXMvc2FmZW1hbGxvYy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkK IDMxMDcgVmFzaWwgRGltb3YJMjAxMC0wNS0xOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLXRy dW5rLWJ1Z2ZpeGluZyAtPiBteXNxbC10cnVuay1pbm5vZGIKCiAgICBhZGRlZDoKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9mdW5jc18xL3Ivcm93X2NvdW50X2Z1bmMucmVzdWx0CiAgICAgIG15c3Fs LXRlc3Qvc3VpdGUvZnVuY3NfMS90L3Jvd19jb3VudF9mdW5jLW1hc3Rlci5vcHQKICAgICAgbXlz cWwtdGVzdC9zdWl0ZS9mdW5jc18xL3Qvcm93X2NvdW50X2Z1bmMudGVzdAogICAgbW9kaWZpZWQ6 CiAgICAgIEJVSUxEL01ha2VmaWxlLmFtCiAgICAgIENNYWtlTGlzdHMudHh0CiAgICAgIERvY3Mv TWFrZWZpbGUuYW0KICAgICAgTWFrZWZpbGUuYW0KICAgICAgY2xpZW50L01ha2VmaWxlLmFtCiAg ICAgIGNtYWtlL2J1aWxkX2NvbmZpZ3VyYXRpb25zL215c3FsX3JlbGVhc2UuY21ha2UKICAgICAg Y21ha2UvaW5zdGFsbF9sYXlvdXQuY21ha2UKICAgICAgY21ha2UvaW5zdGFsbF9tYWNyb3MuY21h a2UKICAgICAgY21ha2UvbXlzcWxfdmVyc2lvbi5jbWFrZQogICAgICBjbWFrZS9wbHVnaW4uY21h a2UKICAgICAgY21kLWxpbmUtdXRpbHMvTWFrZWZpbGUuYW0KICAgICAgY21kLWxpbmUtdXRpbHMv cmVhZGxpbmUvTWFrZWZpbGUuYW0KICAgICAgY29uZmlnLmguY21ha2UKICAgICAgZXh0cmEvTWFr ZWZpbGUuYW0KICAgICAgZXh0cmEveWFzc2wvTWFrZWZpbGUuYW0KICAgICAgZXh0cmEveWFzc2wv c3JjL01ha2VmaWxlLmFtCiAgICAgIGV4dHJhL3lhc3NsL3Rhb2NyeXB0L01ha2VmaWxlLmFtCiAg ICAgIGV4dHJhL3lhc3NsL3Rhb2NyeXB0L2JlbmNobWFyay9NYWtlZmlsZS5hbQogICAgICBleHRy YS95YXNzbC90YW9jcnlwdC9zcmMvTWFrZWZpbGUuYW0KICAgICAgZXh0cmEveWFzc2wvdGFvY3J5 cHQvdGVzdC9NYWtlZmlsZS5hbQogICAgICBleHRyYS95YXNzbC90ZXN0c3VpdGUvTWFrZWZpbGUu YW0KICAgICAgaW5jbHVkZS9NYWtlZmlsZS5hbQogICAgICBsaWJteXNxbC9DTWFrZUxpc3RzLnR4 dAogICAgICBsaWJteXNxbC9NYWtlZmlsZS5hbQogICAgICBsaWJteXNxbC9NYWtlZmlsZS5zaGFy ZWQKICAgICAgbGlibXlzcWxfci9NYWtlZmlsZS5hbQogICAgICBsaWJteXNxbGQvQ01ha2VMaXN0 cy50eHQKICAgICAgbGlibXlzcWxkL01ha2VmaWxlLmFtCiAgICAgIGxpYm15c3FsZC9leGFtcGxl cy9DTWFrZUxpc3RzLnR4dAogICAgICBsaWJteXNxbGQvZXhhbXBsZXMvTWFrZWZpbGUuYW0KICAg ICAgbWFuL0NNYWtlTGlzdHMudHh0CiAgICAgIG1hbi9NYWtlZmlsZS5hbQogICAgICBteXNxbC10 ZXN0L0NNYWtlTGlzdHMudHh0CiAgICAgIG15c3FsLXRlc3QvTWFrZWZpbGUuYW0KICAgICAgbXlz cWwtdGVzdC9jb2xsZWN0aW9ucy9kZWZhdWx0LmV4cGVyaW1lbnRhbAogICAgICBteXNxbC10ZXN0 L2luY2x1ZGUvY3R5cGVfbnVtY29udi5pbmMKICAgICAgbXlzcWwtdGVzdC9pbmNsdWRlL215c3Fs ZC0taGVscC5pbmMKICAgICAgbXlzcWwtdGVzdC9saWIvTXkvU2FmZVByb2Nlc3MvTWFrZWZpbGUu YW0KICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX2JpbmFyeS5yZXN1bHQKICAgICAgbXlzcWwtdGVz dC9yL2N0eXBlX2NwMTI1MS5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX2xhdGluMS5y ZXN1bHQKICAgICAgbXlzcWwtdGVzdC9yL2N0eXBlX3Vjcy5yZXN1bHQKICAgICAgbXlzcWwtdGVz dC9yL215c3FsX2NsaWVudF90ZXN0LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3IvcGFydGl0aW9u LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3Ivc3AucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci92 YXJpYWJsZXNfZGVidWcucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvZnVuY3NfMS9yL2lu bm9kYl9zdG9yZWRwcm9jXzEwLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2Z1bmNzXzEv ci9tZW1vcnlfc3RvcmVkcHJvY18xMC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9mdW5j c18xL3IvbXlpc2FtX3N0b3JlZHByb2NfMTAucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv ZnVuY3NfMS9yL25kYl9zdG9yZWRwcm9jXzEwLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRl L3JwbC90L2Rpc2FibGVkLmRlZgogICAgICBteXNxbC10ZXN0L3QvbXlzcWxfY2xpZW50X3Rlc3Qu dGVzdAogICAgICBteXNxbC10ZXN0L3QvcGFyc2VyX3N0YWNrLnRlc3QKICAgICAgbXlzcWwtdGVz dC90L3BhcnRpdGlvbi50ZXN0CiAgICAgIG15c3FsLXRlc3QvdC92YXJpYWJsZXNfZGVidWcudGVz dAogICAgICBteXN5cy9NYWtlZmlsZS5hbQogICAgICBuZXR3YXJlL01ha2VmaWxlLmFtCiAgICAg IHBsdWdpbi9NYWtlZmlsZS5hbQogICAgICBwbHVnaW4vYXVkaXRfbnVsbC9DTWFrZUxpc3RzLnR4 dAogICAgICBwbHVnaW4vZGFlbW9uX2V4YW1wbGUvTWFrZWZpbGUuYW0KICAgICAgcGx1Z2luL2Z1 bGx0ZXh0L0NNYWtlTGlzdHMudHh0CiAgICAgIHBsdWdpbi9mdWxsdGV4dC9NYWtlZmlsZS5hbQog ICAgICBwc3RhY2svTWFrZWZpbGUuYW0KICAgICAgcHN0YWNrL2FvdXQvTWFrZWZpbGUuYW0KICAg ICAgcmVnZXgvTWFrZWZpbGUuYW0KICAgICAgc2NyaXB0cy9DTWFrZUxpc3RzLnR4dAogICAgICBz Y3JpcHRzL01ha2VmaWxlLmFtCiAgICAgIHNjcmlwdHMvbXlzcWxkX3NhZmUuc2gKICAgICAgc3Fs LWJlbmNoL0NNYWtlTGlzdHMudHh0CiAgICAgIHNxbC1iZW5jaC9NYWtlZmlsZS5hbQogICAgICBz cWwtY29tbW9uL01ha2VmaWxlLmFtCiAgICAgIHNxbC9DTWFrZUxpc3RzLnR4dAogICAgICBzcWwv TWFrZWZpbGUuYW0KICAgICAgc3FsL2hhX25kYmNsdXN0ZXJfYmlubG9nLmNjCiAgICAgIHNxbC9p dGVtX2Z1bmMuY2MKICAgICAgc3FsL2xvZ19ldmVudC5jYwogICAgICBzcWwvcHJvdG9jb2wuY2MK ICAgICAgc3FsL3NoYXJlL01ha2VmaWxlLmFtCiAgICAgIHNxbC9zcWxfY2xhc3MuY2MKICAgICAg c3FsL3NxbF9jbGFzcy5oCiAgICAgIHNxbC9zcWxfZGVsZXRlLmNjCiAgICAgIHNxbC9zcWxfaW5z ZXJ0LmNjCiAgICAgIHNxbC9zcWxfbGV4LmNjCiAgICAgIHNxbC9zcWxfbGV4LmgKICAgICAgc3Fs L3NxbF9wYXJzZS5jYwogICAgICBzcWwvc3FsX3BhcnNlLmgKICAgICAgc3FsL3NxbF9zaWduYWwu Y2MKICAgICAgc3FsL3NxbF91cGRhdGUuY2MKICAgICAgc3RvcmFnZS9NYWtlZmlsZS5hbQogICAg ICBzdG9yYWdlL2FyY2hpdmUvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9ibGFja2hvbGUvTWFr ZWZpbGUuYW0KICAgICAgc3RvcmFnZS9jc3YvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9leGFt cGxlL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvZmVkZXJhdGVkL01ha2VmaWxlLmFtCiAgICAg IHN0b3JhZ2UvaGVhcC9NYWtlZmlsZS5hbQogICAgICBzdG9yYWdlL2libWRiMmkvTWFrZWZpbGUu YW0KICAgICAgc3RvcmFnZS9pbm5vYmFzZS9NYWtlZmlsZS5hbQogICAgICBzdG9yYWdlL215aXNh bS9NYWtlZmlsZS5hbQogICAgICBzdG9yYWdlL215aXNhbW1yZy9NYWtlZmlsZS5hbQogICAgICBz dG9yYWdlL25kYi9NYWtlZmlsZS5hbQogICAgICBzdG9yYWdlL25kYi9kb2NzL01ha2VmaWxlLmFt CiAgICAgIHN0b3JhZ2UvbmRiL2luY2x1ZGUvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIv c3JjL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21tb24vTWFrZWZpbGUuYW0K ICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi9kZWJ1Z2dlci9NYWtlZmlsZS5hbQogICAgICBz dG9yYWdlL25kYi9zcmMvY29tbW9uL2RlYnVnZ2VyL3NpZ25hbGRhdGEvTWFrZWZpbGUuYW0KICAg ICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi9sb2dnZXIvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFn ZS9uZGIvc3JjL2NvbW1vbi9tZ21jb21tb24vTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIv c3JjL2NvbW1vbi9wb3J0bGliL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21t b24vdHJhbnNwb3J0ZXIvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi91 dGlsL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jdy9NYWtlZmlsZS5hbQogICAg ICBzdG9yYWdlL25kYi9zcmMvY3cvY3BjZC9NYWtlZmlsZS5hbQogICAgICBzdG9yYWdlL25kYi9z cmMva2VybmVsL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9rZXJuZWwvYmxvY2tz L01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9rZXJuZWwvYmxvY2tzL2JhY2t1cC9N YWtlZmlsZS5hbQogICAgICBzdG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYmRpY3QvTWFr ZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJkaWgvTWFrZWZp bGUuYW0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJscWgvTWFrZWZpbGUu YW0KICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJ0dXAvTWFrZWZpbGUuYW0K ICAgICAgc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9lcnJvci9NYWtlZmlsZS5hbQogICAgICBzdG9y YWdlL25kYi9zcmMva2VybmVsL3ZtL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9t Z21hcGkvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvc3JjL21nbWNsaWVudC9NYWtlZmls ZS5hbQogICAgICBzdG9yYWdlL25kYi9zcmMvbWdtc3J2L01ha2VmaWxlLmFtCiAgICAgIHN0b3Jh Z2UvbmRiL3NyYy9uZGJhcGkvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvdGVzdC9NYWtl ZmlsZS5hbQogICAgICBzdG9yYWdlL25kYi90ZXN0L25kYmFwaS9NYWtlZmlsZS5hbQogICAgICBz dG9yYWdlL25kYi90ZXN0L25kYmFwaS9iYW5rL01ha2VmaWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRi L3Rlc3QvcnVuLXRlc3QvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvdGVzdC9zcmMvTWFr ZWZpbGUuYW0KICAgICAgc3RvcmFnZS9uZGIvdGVzdC90b29scy9NYWtlZmlsZS5hbQogICAgICBz dG9yYWdlL25kYi90b29scy9NYWtlZmlsZS5hbQogICAgICBzdHJpbmdzL01ha2VmaWxlLmFtCiAg ICAgIHN1cHBvcnQtZmlsZXMvQ01ha2VMaXN0cy50eHQKICAgICAgc3VwcG9ydC1maWxlcy9NYWNP U1gvTWFrZWZpbGUuYW0KICAgICAgc3VwcG9ydC1maWxlcy9NYWtlZmlsZS5hbQogICAgICBzdXBw b3J0LWZpbGVzL1JIRUw0LVNFbGludXgvTWFrZWZpbGUuYW0KICAgICAgc3VwcG9ydC1maWxlcy9t eXNxbC5zcGVjLnNoCiAgICAgIHRlc3RzL01ha2VmaWxlLmFtCiAgICAgIHVuaXR0ZXN0L01ha2Vm aWxlLmFtCiAgICAgIHVuaXR0ZXN0L2V4YW1wbGVzL01ha2VmaWxlLmFtCiAgICAgIHVuaXR0ZXN0 L215dGFwL3QvTWFrZWZpbGUuYW0KICAgICAgdmlvL01ha2VmaWxlLmFtCiAgICAgIHdpbi9NYWtl ZmlsZS5hbQogICAgICB6bGliL01ha2VmaWxlLmFtCj09PSBtb2RpZmllZCBmaWxlICdCVUlMRC9T RVRVUC5zaCcKLS0tIGEvQlVJTEQvU0VUVVAuc2gJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNv bS0yMDEwMDUxOTIwNDg1MC1kN29kdmp5ZngxZ3Y2Zm1zCisrKyBiL0JVSUxEL1NFVFVQLnNoCXJl dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZw MWcKQEAgLTExOSw4ICsxMTksMTIgQEAgZmkKIAogIyBTZXQgZmxhZ3MgZm9yIHZhcmlvdXMgYnVp bGQgY29uZmlndXJhdGlvbnMuCiAjIFVzZWQgaW4gLXZhbGdyaW5kIGJ1aWxkcwotdmFsZ3JpbmRf ZmxhZ3M9Ii1VU0FGRU1BTExPQyAtVUZPUkNFX0lOSVRfT0ZfVkFSUyAtREhBVkVfcHVyaWZ5ICIK KyMgT3ZlcnJpZGUgLURGT1JDRV9JTklUX09GX1ZBUlMgZnJvbSBkZWJ1Z19jZmxhZ3MuIEl0IGVu YWJsZXMgdGhlIG1hY3JvCisjIExJTlRfSU5JVCgpLCB3aGljaCBpcyBvbmx5IHVzZWZ1bCBmb3Ig c2lsZW5jaW5nIHNwdXJpb3VzIHdhcm5pbmdzCisjIG9mIHN0YXRpYyBhbmFseXNpcyB0b29scy4g V2Ugd2FudCBMSU5UX0lOSVQoKSB0byBiZSBhIG5vLW9wIGluIFZhbGdyaW5kLgordmFsZ3JpbmRf ZmxhZ3M9Ii1VRk9SQ0VfSU5JVF9PRl9WQVJTIC1ESEFWRV9wdXJpZnkgIgogdmFsZ3JpbmRfZmxh Z3M9IiR2YWxncmluZF9mbGFncyAtRE1ZU1FMX1NFUlZFUl9TVUZGSVg9LXZhbGdyaW5kLW1heCIK K3ZhbGdyaW5kX2NvbmZpZ3M9Ii0td2l0aC12YWxncmluZCIKICMKICMgVXNlZCBpbiAtZGVidWcg YnVpbGRzCiBkZWJ1Z19jZmxhZ3M9Ii1EVU5JVl9NVVNUX05PVF9JTkxJTkUgLURFWFRSQV9ERUJV RyAtREZPUkNFX0lOSVRfT0ZfVkFSUyAiCgo9PT0gbW9kaWZpZWQgZmlsZSAnQlVJTEQvYnVpbGRf bWNjZ2Uuc2gnCi0tLSBhL0JVSUxEL2J1aWxkX21jY2dlLnNoCXJldmlkOnZhc2lsLmRpbW92QG9y YWNsZS5jb20tMjAxMDA1MTkyMDQ4NTAtZDdvZHZqeWZ4MWd2NmZtcworKysgYi9CVUlMRC9idWls ZF9tY2NnZS5zaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDExNDMwNi1v ejhtY2U3eThtN3k2cDFnCkBAIC0xMDEwLDkgKzEwMTAsMTAgQEAgc2V0X2NjYWNoZV91c2FnZSgp CiBzZXRfdmFsZ3JpbmRfZmxhZ3MoKQogewogICBpZiB0ZXN0ICJ4JHZhbGdyaW5kX2ZsYWciID0g Inh5ZXMiIDsgdGhlbgotICAgIGxvY192YWxncmluZF9mbGFncz0iLVVTQUZFTUFMTE9DIC1VRk9S Q0VfSU5JVF9PRl9WQVJTIC1ESEFWRV9wdXJpZnkgIgorICAgIGxvY192YWxncmluZF9mbGFncz0i LVVGT1JDRV9JTklUX09GX1ZBUlMgLURIQVZFX3B1cmlmeSAiCiAgICAgbG9jX3ZhbGdyaW5kX2Zs YWdzPSIkbG9jX3ZhbGdyaW5kX2ZsYWdzIC1ETVlTUUxfU0VSVkVSX1NVRkZJWD0tdmFsZ3JpbmQt bWF4IgogICAgIGNvbXBpbGVyX2ZsYWdzPSIkY29tcGlsZXJfZmxhZ3MgJGxvY192YWxncmluZF9m bGFncyIKKyAgICB3aXRoX2ZsYWdzPSIkd2l0aF9mbGFncyAtLXdpdGgtdmFsZ3JpbmQiCiAgIGZp CiB9CiAKCj09PSBtb2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLWFtZDY0LXZhbGdyaW5kLW1h eCcKLS0tIGEvQlVJTEQvY29tcGlsZS1hbWQ2NC12YWxncmluZC1tYXgJcmV2aWQ6dmFzaWwuZGlt b3ZAb3JhY2xlLmNvbS0yMDEwMDUxOTIwNDg1MC1kN29kdmp5ZngxZ3Y2Zm1zCisrKyBiL0JVSUxE L2NvbXBpbGUtYW1kNjQtdmFsZ3JpbmQtbWF4CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t LTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKQEAgLTQsNyArNCw3IEBAIHBhdGg9YGRp cm5hbWUgJDBgCiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFfZmxhZ3M9IiRhbWQ2NF9jZmxh Z3MgJGRlYnVnX2NmbGFncyAkdmFsZ3JpbmRfZmxhZ3MiCi1leHRyYV9jb25maWdzPSIkYW1kNjRf Y29uZmlncyAkZGVidWdfY29uZmlncyAkbWF4X2NvbmZpZ3MiCitleHRyYV9jb25maWdzPSIkYW1k NjRfY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3JpbmRfY29uZmlncyAkbWF4X2NvbmZpZ3Mi CiAKIC4gIiRwYXRoL0ZJTklTSC5zaCIKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ0JVSUxEL2NvbXBp bGUtcGVudGl1bS1pY2MtdmFsZ3JpbmQtbWF4JwotLS0gYS9CVUlMRC9jb21waWxlLXBlbnRpdW0t aWNjLXZhbGdyaW5kLW1heAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0 ODUwLWQ3b2R2anlmeDFndjZmbXMKKysrIGIvQlVJTEQvY29tcGlsZS1wZW50aXVtLWljYy12YWxn cmluZC1tYXgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMTQzMDYtb3o4 bWNlN3k4bTd5NnAxZwpAQCAtMjksNiArMjksNiBAQCBleHRyYV9mbGFncz0iJHBlbnRpdW1fY2Zs YWdzICRkZWJ1Z19jZmxhCiBjX3dhcm5pbmdzPSItV2FsbCAtV2NoZWNrIC13ZDE2MSw0NDQsMjc5 LDgxMCw5ODEsMTI5MiwxNDY5LDE1NzIiCiBjeHhfd2FybmluZ3M9IiRjX3dhcm5pbmdzIC13ZDg2 OSw4NzQiCiBiYXNlX2N4eGZsYWdzPSItZm5vLWV4Y2VwdGlvbnMgLWZuby1ydHRpIgotZXh0cmFf Y29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyIKK2V4dHJhX2NvbmZpZ3M9 IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJHZhbGdyaW5kX2NvbmZpZ3MiCiAKIC4g IiRwYXRoL0ZJTklTSC5zaCIKCj09PSBtb2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLXBlbnRp dW0tdmFsZ3JpbmQtbWF4JwotLS0gYS9CVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4 CXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMDA1MTkyMDQ4NTAtZDdvZHZqeWZ4MWd2 NmZtcworKysgYi9CVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4CXJldmlkOm1hcmtv Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKQEAgLTQs NyArNCw3IEBAIHBhdGg9YGRpcm5hbWUgJDBgCiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFf ZmxhZ3M9IiRwZW50aXVtX2NmbGFncyAkZGVidWdfY2ZsYWdzICR2YWxncmluZF9mbGFncyIKLWV4 dHJhX2NvbmZpZ3M9IiRwZW50aXVtX2NvbmZpZ3MgJGRlYnVnX2NvbmZpZ3MgJG1heF9jb25maWdz IgorZXh0cmFfY29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFsZ3Jp bmRfY29uZmlncyAkbWF4X2NvbmZpZ3MiCiAKIC4gIiRwYXRoL0ZJTklTSC5zaCIKIAoKPT09IG1v ZGlmaWVkIGZpbGUgJ0JVSUxEL2NvbXBpbGUtcGVudGl1bS12YWxncmluZC1tYXgtbm8tbmRiJwot LS0gYS9CVUlMRC9jb21waWxlLXBlbnRpdW0tdmFsZ3JpbmQtbWF4LW5vLW5kYglyZXZpZDp2YXNp bC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0ODUwLWQ3b2R2anlmeDFndjZmbXMKKysrIGIv QlVJTEQvY29tcGlsZS1wZW50aXVtLXZhbGdyaW5kLW1heC1uby1uZGIJcmV2aWQ6bWFya28ubWFr ZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMTQzMDYtb3o4bWNlN3k4bTd5NnAxZwpAQCAtNCw3ICs0 LDcgQEAgcGF0aD1gZGlybmFtZSAkMGAKIC4gIiRwYXRoL1NFVFVQLnNoIgogCiBleHRyYV9mbGFn cz0iJHBlbnRpdW1fY2ZsYWdzICRkZWJ1Z19jZmxhZ3MgJHZhbGdyaW5kX2ZsYWdzIgotZXh0cmFf Y29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkbWF4X25vX25kYl9jb25m aWdzIgorZXh0cmFfY29uZmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkdmFs Z3JpbmRfY29uZmlncyAkbWF4X25vX25kYl9jb25maWdzIgogCiAuICIkcGF0aC9GSU5JU0guc2gi CiAKCj09PSBtb2RpZmllZCBmaWxlICdCVUlMRC9jb21waWxlLXBlbnRpdW02NC12YWxncmluZC1t YXgnCi0tLSBhL0JVSUxEL2NvbXBpbGUtcGVudGl1bTY0LXZhbGdyaW5kLW1heAlyZXZpZDp2YXNp bC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0ODUwLWQ3b2R2anlmeDFndjZmbXMKKysrIGIv QlVJTEQvY29tcGlsZS1wZW50aXVtNjQtdmFsZ3JpbmQtbWF4CXJldmlkOm1hcmtvLm1ha2VsYUBv cmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKQEAgLTQsNyArNCw3IEBA IHBhdGg9YGRpcm5hbWUgJDBgCiAuICIkcGF0aC9TRVRVUC5zaCIKIAogZXh0cmFfZmxhZ3M9IiRw ZW50aXVtNjRfY2ZsYWdzICRkZWJ1Z19jZmxhZ3MgJHZhbGdyaW5kX2ZsYWdzIgotZXh0cmFfY29u Zmlncz0iJHBlbnRpdW1fY29uZmlncyAkZGVidWdfY29uZmlncyAkbWF4X2NvbmZpZ3MiCitleHRy YV9jb25maWdzPSIkcGVudGl1bV9jb25maWdzICRkZWJ1Z19jb25maWdzICR2YWxncmluZF9jb25m aWdzICRtYXhfY29uZmlncyIKIAogLiAiJHBhdGgvRklOSVNILnNoIgogCgo9PT0gbW9kaWZpZWQg ZmlsZSAnY29uZmlndXJlLmluJwotLS0gYS9jb25maWd1cmUuaW4JcmV2aWQ6dmFzaWwuZGltb3ZA b3JhY2xlLmNvbS0yMDEwMDUxOTIwNDg1MC1kN29kdmp5ZngxZ3Y2Zm1zCisrKyBiL2NvbmZpZ3Vy ZS5pbglyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDExNDMwNi1vejhtY2U3 eThtN3k2cDFnCkBAIC0xODQ0LDYgKzE4NDQsMTcgQEAgZWxzZQogICBDWFhGTEFHUz0iJE9QVElN SVpFX0NYWEZMQUdTICRDWFhGTEFHUyIKIGZpCiAKK0FDX0FSR19XSVRIKFt2YWxncmluZF0sCisg IFtBU19IRUxQX1NUUklORyhbLS13aXRoLXZhbGdyaW5kXSwKKyAgICBbVmFsZ3JpbmQgaW5zdHJ1 bWVudGF0aW9uIEA8OkBkZWZhdWx0PW5vQDo+QF0pXSwKKyAgICBbXSwgW3dpdGhfdmFsZ3JpbmQ9 bm9dKQorCitpZiB0ZXN0ICIkd2l0aF92YWxncmluZCIgIT0gIm5vIgordGhlbgorICBBQ19DSEVD S19IRUFERVJTKFt2YWxncmluZC92YWxncmluZC5oIHZhbGdyaW5kL21lbWNoZWNrLmhdLAorICAg IFtBQ19ERUZJTkUoW0hBVkVfVkFMR1JJTkRdLCBbMV0sIFtEZWZpbmUgZm9yIFZhbGdyaW5kIHN1 cHBvcnRdKV0pCitmaQorCiAjIERlYnVnIFN5bmMgRmFjaWxpdHkuIE5PVEU6IGRlcGVuZHMgb24g J3dpdGhfZGVidWcnLiBNdXN0IGJlIGJlaGluZCBpdC4KIEFDX01TR19DSEVDS0lORyhpZiBEZWJ1 ZyBTeW5jIEZhY2lsaXR5IHNob3VsZCBiZSBlbmFibGVkLikKIEFDX0FSR19FTkFCTEUoZGVidWdf c3luYywKCj09PSBtb2RpZmllZCBmaWxlICdpbmNsdWRlL21fc3RyaW5nLmgnCi0tLSBhL2luY2x1 ZGUvbV9zdHJpbmcuaAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0ODUw LWQ3b2R2anlmeDFndjZmbXMKKysrIGIvaW5jbHVkZS9tX3N0cmluZy5oCXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKQEAgLTEyNyw5 ICsxMjcsNiBAQCBleHRlcm4Jc2l6ZV90IGJjbXAoY29uc3QgdWNoYXIgKnMxLGNvbnN0CiBleHRl cm4Jc2l6ZV90IG15X2JjbXAoY29uc3QgdWNoYXIgKnMxLGNvbnN0IHVjaGFyICpzMixzaXplX3Qg bGVuKTsKICN1bmRlZiBiY21wCiAjZGVmaW5lIGJjbXAoQSxCLEMpIG15X2JjbXAoKEEpLChCKSwo QykpCi0jZGVmaW5lIGJ6ZXJvX2lmX3B1cmlmeShBLEIpIGJ6ZXJvKEEsQikKLSNlbHNlCi0jZGVm aW5lIGJ6ZXJvX2lmX3B1cmlmeShBLEIpCiAjZW5kaWYgLyogSEFWRV9wdXJpZnkgKi8KIAogI2lm bmRlZiBibW92ZTUxMgoKPT09IG1vZGlmaWVkIGZpbGUgJ2luY2x1ZGUvbXlfc3lzLmgnCi0tLSBh L2luY2x1ZGUvbXlfc3lzLmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEwMDUxOTIw NDg1MC1kN29kdmp5ZngxZ3Y2Zm1zCisrKyBiL2luY2x1ZGUvbXlfc3lzLmgJcmV2aWQ6bWFya28u bWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MjAxMTQzMDYtb3o4bWNlN3k4bTd5NnAxZwpAQCAtMjgs NiArMjgsMTkgQEAgdHlwZWRlZiBzdHJ1Y3QgbXlfYWlvX3Jlc3VsdCB7CiB9IG15X2Fpb19yZXN1 bHQ7CiAjZW5kaWYKIAorI2lmZGVmIEhBVkVfVkFMR1JJTkQKKyMgaW5jbHVkZSA8dmFsZ3JpbmQv bWVtY2hlY2suaD4KKyMgZGVmaW5lIE1FTV9VTkRFRklORUQoYSxsZW4pIFZBTEdSSU5EX01BS0Vf TUVNX1VOREVGSU5FRChhLGxlbikKKyMgZGVmaW5lIE1FTV9OT0FDQ0VTUyhhLGxlbikgVkFMR1JJ TkRfTUFLRV9NRU1fTk9BQ0NFU1MoYSxsZW4pCisjIGRlZmluZSBNRU1fQ0hFQ0tfQUREUkVTU0FC TEUoYSxsZW4pIFZBTEdSSU5EX0NIRUNLX01FTV9JU19BRERSRVNTQUJMRShhLGxlbikKKyMgZGVm aW5lIE1FTV9DSEVDS19ERUZJTkVEKGEsbGVuKSBWQUxHUklORF9DSEVDS19NRU1fSVNfREVGSU5F RChhLGxlbikKKyNlbHNlIC8qIEhBVkVfVkFMR1JJTkQgKi8KKyMgZGVmaW5lIE1FTV9VTkRFRklO RUQoYSxsZW4pICgodm9pZCkgMCkKKyMgZGVmaW5lIE1FTV9OT0FDQ0VTUyhhLGxlbikgKCh2b2lk KSAwKQorIyBkZWZpbmUgTUVNX0NIRUNLX0FERFJFU1NBQkxFKGEsbGVuKSAoKHZvaWQpIDApCisj IGRlZmluZSBNRU1fQ0hFQ0tfREVGSU5FRChhLGxlbikgKCh2b2lkKSAwKQorI2VuZGlmIC8qIEhB VkVfVkFMR1JJTkQgKi8KKwogI2lmbmRlZiBUSFJFQUQKIGV4dGVybiBpbnQgTkVBUiBteV9lcnJu bzsJCS8qIExhc3QgZXJyb3IgaW4gbXlzeXMgKi8KICNlbHNlCkBAIC0xNTYsNyArMTY5LDcgQEAg ZXh0ZXJuIGludCBORUFSIG15X2Vycm5vOwkJLyogTGFzdCBlcnJvcgogI2RlZmluZSBteV9tZW1k dXAoQSxCLEMpIF9teV9tZW1kdXAoKEEpLChCKSwgX19GSUxFX18sX19MSU5FX18sQykKICNkZWZp bmUgbXlfc3RyZHVwKEEsQykgX215X3N0cmR1cCgoQSksIF9fRklMRV9fLF9fTElORV9fLEMpCiAj ZGVmaW5lIG15X3N0cm5kdXAoQSxCLEMpIF9teV9zdHJuZHVwKChBKSwoQiksX19GSUxFX18sX19M SU5FX18sQykKLSNkZWZpbmUgVFJBU0goQSxCKSBiZmlsbChBLCBCLCAweDhGKQorI2RlZmluZSBU UkFTSChBLEIpIGRvIHsgYmZpbGwoQSwgQiwgMHg4Rik7IE1FTV9VTkRFRklORUQoQSwgQik7IH0g d2hpbGUgKDApCiAjZGVmaW5lIFFVSUNLX1NBRkVNQUxMT0Mgc2ZfbWFsbG9jX3F1aWNrPTEKICNk ZWZpbmUgTk9STUFMX1NBRkVNQUxMT0Mgc2ZfbWFsbG9jX3F1aWNrPTAKIGV4dGVybiB1aW50IHNm X21hbGxvY19wcmVodW5jLHNmX21hbGxvY19lbmRodW5jLHNmX21hbGxvY19xdWljazsKQEAgLTE4 NCw3ICsxOTcsNyBAQCBleHRlcm4gY2hhciAqbXlfc3RybmR1cChjb25zdCBjaGFyICpmcm9tCiAj ZGVmaW5lIENBTExFUl9JTkZPX1BST1RPICAgLyogbm90aGluZyAqLwogI2RlZmluZSBDQUxMRVJf SU5GTyAgICAgICAgIC8qIG5vdGhpbmcgKi8KICNkZWZpbmUgT1JJR19DQUxMRVJfSU5GTyAgICAv KiBub3RoaW5nICovCi0jZGVmaW5lIFRSQVNIKEEsQikgLyogbm90aGluZyAqLworI2RlZmluZSBU UkFTSChBLEIpIGRve01FTV9DSEVDS19BRERSRVNTQUJMRShBLEIpO01FTV9VTkRFRklORUQoQSxC KTt9IHdoaWxlICgwKQogI2VuZGlmCiAKICNpZiBkZWZpbmVkKEVOQUJMRURfREVCVUdfU1lOQykK Cj09PSBtb2RpZmllZCBmaWxlICdteXN5cy9zYWZlbWFsbG9jLmMnCi0tLSBhL215c3lzL3NhZmVt YWxsb2MuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0ODUwLWQ3b2R2 anlmeDFndjZmbXMKKysrIGIvbXlzeXMvc2FmZW1hbGxvYy5jCXJldmlkOm1hcmtvLm1ha2VsYUBv cmFjbGUuY29tLTIwMTAwNTIwMTE0MzA2LW96OG1jZTd5OG03eTZwMWcKQEAgLTE5MCw5ICsxOTAs MTIgQEAgdm9pZCAqX215bWFsbG9jKHNpemVfdCBzaXplLCBjb25zdCBjaGFyCiAgIHNmX21hbGxv Y19jb3VudCsrOwogICBteXNxbF9tdXRleF91bmxvY2soJlRIUl9MT0NLX21hbGxvYyk7CiAKKyAg TUVNX0NIRUNLX0FERFJFU1NBQkxFKGRhdGEsIHNpemUpOwogICAvKiBTZXQgdGhlIG1lbW9yeSB0 byB0aGUgYXJpYnRyYXJ5IHdpZXJkIHZhbHVlICovCiAgIGlmICgoTXlGbGFncyAmIE1ZX1pFUk9G SUxMKSB8fCAhc2ZfbWFsbG9jX3F1aWNrKQogICAgIGJmaWxsKGRhdGEsIHNpemUsIChjaGFyKSAo TXlGbGFncyAmIE1ZX1pFUk9GSUxMID8gMCA6IEFMTE9DX1ZBTCkpOworICBpZiAoIShNeUZsYWdz ICYgTVlfWkVST0ZJTEwpKQorICAgIE1FTV9VTkRFRklORUQoZGF0YSwgc2l6ZSk7CiAgIC8qIFJl dHVybiBhIHBvaW50ZXIgdG8gdGhlIHJlYWwgZGF0YSAqLwogICBEQlVHX1BSSU5UKCJleGl0Iiwo InB0cjogJXAiLCBkYXRhKSk7CiAgIGlmIChzZl9taW5fYWRyZXNzID4gZGF0YSkKQEAgLTMwOSw3 ICszMTIsOSBAQCB2b2lkIF9teWZyZWUodm9pZCAqcHRyLCBjb25zdCBjaGFyICpmaWxlCiAgIGlm ICghc2ZfbWFsbG9jX3F1aWNrKQogICAgIGJmaWxsKHB0ciwgaXJlbS0+ZGF0YXNpemUsIChwY2hh cikgRlJFRV9WQUwpOwogI2VuZGlmCisgIE1FTV9OT0FDQ0VTUyhwdHIsIGlyZW0tPmRhdGFzaXpl KTsKICAgKigodWludDMyKikgKChjaGFyKikgcHRyLSBzaXplb2YodWludDMyKSkpPSB+TUFHSUNL RVk7CisgIE1FTV9OT0FDQ0VTUygoY2hhciopIHB0ciAtIHNpemVvZih1aW50MzIpLCBzaXplb2Yo dWludDMyKSk7CiAgIC8qIEFjdHVhbGx5IGZyZWUgdGhlIG1lbW9yeSAqLwogICBmcmVlKChjaGFy KikgaXJlbSk7CiAgIERCVUdfVk9JRF9SRVRVUk47Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn ZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl L3VuaXYuaQlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTE5MjA0ODUwLWQ3b2R2 anlmeDFndjZmbXMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQlyZXZpZDpt YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUyMDExNDMwNi1vejhtY2U3eThtN3k2cDFnCkBA IC0xODIsOSArMTgyLDkgQEAgY29tbWFuZC4gTm90IHRlc3RlZCBvbiBXaW5kb3dzLiAqLwogI2Rl ZmluZSBVTklWX0NPTVBJTEVfVEVTVF9GVU5DUwogKi8KIAotI2lmZGVmIEhBVkVfcHVyaWZ5Cisj aWYgZGVmaW5lZCBIQVZFX1ZBTEdSSU5ECiAjIGRlZmluZSBVTklWX0RFQlVHX1ZBTEdSSU5ECi0j ZW5kaWYgLyogSEFWRV9wdXJpZnkgKi8KKyNlbmRpZiAvKiBIQVZFX1ZBTEdSSU5EICovCiAjaWYg MAogI2RlZmluZSBVTklWX0RFQlVHX1ZBTEdSSU5ECQkJLyogRW5hYmxlIGV4dHJhCiAJCQkJCQlW YWxncmluZCBpbnN0cnVtZW50YXRpb24gKi8KCg== --===============0109818431== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marko.makela@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@stripped # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 14503f8745c02098b1d74f0ac20f16ae66ed2eae # timestamp: 2010-05-20 14:44:06 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@stripped\ # d7odvjyfx1gv6fms # # Begin bundle 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 //i7kinChINDAaUA --===============0109818431==--