From: marko.makela Date: February 2 2012 12:04pm Subject: bzr push into mysql-5.1 branch (marko.makela:3680 to 3681) Bug#13654923 List-Archive: http://lists.mysql.com/commits/142722 X-Bug: 13654923 Message-Id: <201202021204.q12C4hwl018974@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM2ODEgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wMgogICAgICBCdWcjMTM2NTQ5MjMgQk9HVVMg REVCVUcgQVNTRVJUSU9OIElOIElOREVYIENSRUFUSU9OIEZPUiBaRVJPLUxFTkdUSCBSRUNPUkQK ICAgICAgCiAgICAgIHJvd19tZXJnZV9idWZfd3JpdGUoKTogUmVsYXggdGhlIGJvZ3VzIGFzc2Vy dGlvbi4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu L3IvaW5ub2RiLWluZGV4LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVn aW4vdC9pbm5vZGItaW5kZXgudGVzdAogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3Jv dzBtZXJnZS5jCiAzNjgwIE1hcmtvIE3DpGtlbMOkCTIwMTItMDItMDIKICAgICAgU3VwcHJlc3Mg bWVzc2FnZXMgYWJvdXQgbG9uZyBzZW1hcGhvcmUgd2FpdHMgaW4gaW5ub2RiX2J1ZzM0MzAwLnRl c3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2Ri X2J1ZzM0MzAwLnRlc3QKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3QvaW5u b2RiX2J1ZzM0MzAwLnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5u b2RiX3BsdWdpbi9yL2lubm9kYi1pbmRleC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUv aW5ub2RiX3BsdWdpbi9yL2lubm9kYi1pbmRleC5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9y YWNsZS5jb20tMjAxMjAyMDIxMDA3MDYtcGVuenU3OGJoY3gxZXFvbQorKysgYi9teXNxbC10ZXN0 L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1h a2VsYUBvcmFjbGUuY29tLTIwMTIwMjAyMTEzODMyLWhoendhN3diMTNsYjBxamEKQEAgLTExNCw2 ICsxMTQsMTAgQEAgdDEyOTYzODIzCUNSRUFURSBUQUJMRSBgdDEyOTYzODIzYCAoCiAgIEtFWSBg bmR4X29gIChgb2AoNTAwKSksCiAgIEtFWSBgbmR4X3BgIChgcGAoNTAwKSkKICkgRU5HSU5FPUlu bm9EQiBERUZBVUxUIENIQVJTRVQ9bGF0aW4xIFJPV19GT1JNQVQ9RFlOQU1JQworY3JlYXRlIHRh YmxlIHQxKGEgdmFyY2hhcigyKSBwcmltYXJ5IGtleSkgZW5naW5lPWlubm9kYjsKK2luc2VydCBp bnRvIHQxIHZhbHVlcygnJyk7CitjcmVhdGUgaW5kZXggdDFhMSBvbiB0MShhKDEpKTsKK2Ryb3Ag dGFibGUgdDE7CiBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX3Blcl90YWJsZT0wOwogc2V0IGdsb2Jh bCBpbm5vZGJfZmlsZV9mb3JtYXQ9QW50ZWxvcGU7CiBjcmVhdGUgdGFibGUgdDEoYSBpbnQgbm90 IG51bGwsIGIgaW50LCBjIGNoYXIoMTApIG5vdCBudWxsLCBkIHZhcmNoYXIoMjApKSBlbmdpbmUg PSBpbm5vZGI7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1 Z2luL3QvaW5ub2RiLWluZGV4LnRlc3QnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3Bs dWdpbi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw MTIwMjAyMTAwNzA2LXBlbnp1NzhiaGN4MWVxb20KKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5v ZGJfcGx1Z2luL3QvaW5ub2RiLWluZGV4LnRlc3QJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j b20tMjAxMjAyMDIxMTM4MzItaGh6d2E3d2IxM2xiMHFqYQpAQCAtMTE5LDYgKzExOSwxMSBAQCBz aG93IGNyZWF0ZSB0YWJsZSB0MTI5NjM4MjM7CiAjIHRoaXMgZmlsZSBjb21wbGV0ZSBiZWZvcmUg ZHJvcHBpbmcgdGhlIHRhYmxlLiAgQnkgdGhlbiwgdGhlIHB1cmdlIHRocmVhZAogIyB3aWxsIGhh dmUgZGVsdCB3aXRoIHRoZSB1cGRhdGVzIGFib3ZlLgogCisjIEJ1ZyMxMzY1NDkyMyBCT0dVUyBE RUJVRyBBU1NFUlRJT04gSU4gSU5ERVggQ1JFQVRJT04gRk9SIFpFUk8tTEVOR1RIIFJFQ09SRAor Y3JlYXRlIHRhYmxlIHQxKGEgdmFyY2hhcigyKSBwcmltYXJ5IGtleSkgZW5naW5lPWlubm9kYjsK K2luc2VydCBpbnRvIHQxIHZhbHVlcygnJyk7CitjcmVhdGUgaW5kZXggdDFhMSBvbiB0MShhKDEp KTsKK2Ryb3AgdGFibGUgdDE7CiAKIGV2YWwgc2V0IGdsb2JhbCBpbm5vZGJfZmlsZV9wZXJfdGFi bGU9JHBlcl90YWJsZTsKIGV2YWwgc2V0IGdsb2JhbCBpbm5vZGJfZmlsZV9mb3JtYXQ9JGZvcm1h dDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJn ZS5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBtZXJnZS5jCXJldmlkOm1h cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjAyMTAwNzA2LXBlbnp1NzhiaGN4MWVxb20KKysr IGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2UuYwlyZXZpZDptYXJrby5tYWtl bGFAb3JhY2xlLmNvbS0yMDEyMDIwMjExMzgzMi1oaHp3YTd3YjEzbGIwcWphCkBAIC0xLDYgKzEs NiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMjAwNSwgMjAxMCwg SW5ub2Jhc2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTUsIDIw MTIsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAK IFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBh bmQvb3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNTc2LDcgKzU3 Niw3IEBAIHJvd19tZXJnZV9idWZfd3JpdGUoCiAJCQkJCQkgICBSRUNfU1RBVFVTX09SRElOQVJZ LAogCQkJCQkJICAgZW50cnksIG5fZmllbGRzLAogCQkJCQkJICAgJmV4dHJhX3NpemUpOwotCQl1 dF9hZChzaXplID4gZXh0cmFfc2l6ZSk7CisJCXV0X2FkKHNpemUgPj0gZXh0cmFfc2l6ZSk7CiAJ CXV0X2FkKGV4dHJhX3NpemUgPj0gUkVDX05fTkVXX0VYVFJBX0JZVEVTKTsKIAkJZXh0cmFfc2l6 ZSAtPSBSRUNfTl9ORVdfRVhUUkFfQllURVM7CiAJCXNpemUgLT0gUkVDX05fTkVXX0VYVFJBX0JZ VEVTOwoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=