From: Alexander Nozdrin Date: November 25 2010 12:37pm Subject: bzr push into mysql-trunk-bugfixing branch (alexander.nozdrin:3394 to 3395) List-Archive: http://lists.mysql.com/commits/125021 Message-Id: <201011251239.oAP8GD3X009959@rcsinet15.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDMzOTUgQWxleGFuZGVyIE5vemRyaW4JMjAxMC0xMS0yNSBbbWVyZ2VdCiAgICAgIE1lcmdlIGZy b20gbXlzcWwtNS41LWJ1Z3RlYW0uCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9m dW5jX3RpbWUucmVzdWx0CiAgICAgIG15c3FsLXRlc3QvdC9mdW5jX3RpbWUudGVzdAogICAgICBz cWwvaXRlbV90aW1lZnVuYy5jYwogMzM5NCBNYWdudXMgQmzDpXVkZAkyMDEwLTExLTI1CiAgICAg IFdMIzMxMjcgc2xhdmUgc2lkZSBUQ1AgYWRkcmVzcyBiaW5kaW5nCiAgICAgICAtIEV4dGVuZCBD SEFOR0UgTUFTVEVSIHdpdGggTUFTVEVSX0JJTkQ9J2ludGVyZmFjZScKICAgICAgIC0gRXh0ZW5k IFNIT1cgU0xBVkUgU1RBVFVTIHdpdGggYSBuZXcgY29sdW1uIE1hc3Rlcl9CaW5kCiAgICAgICAt IEFkZCB0ZXN0Y2FzZQoKICAgIGFkZGVkOgogICAgICBteXNxbC10ZXN0L2V4dHJhL3JwbF90ZXN0 cy9ycGxfY2hhbmdlX21hc3Rlcl9iaW5kLmluYwogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRl c3QvZXh0cmEvcnBsX3Rlc3RzL3JwbF9jaGFuZ2VfbWFzdGVyLnRlc3QKICAgICAgbXlzcWwtdGVz dC9pbmNsdWRlL2NoZWNrX2lwdjYuaW5jCiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBs X2NoYW5nZV9tYXN0ZXIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3IvcnBsX2No YW5nZV9tYXN0ZXJfY3Jhc2hfc2FmZS5yZXN1bHQKICAgICAgc3FsL2xleC5oCiAgICAgIHNxbC9y cGxfbWkuY2MKICAgICAgc3FsL3JwbF9taS5oCiAgICAgIHNxbC9ycGxfc2xhdmUuY2MKICAgICAg c3FsL3NxbF9sZXguaAogICAgICBzcWwvc3FsX3lhY2MueXkKPT09IG1vZGlmaWVkIGZpbGUgJ215 c3FsLXRlc3Qvci9mdW5jX3RpbWUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3IvZnVuY190aW1l LnJlc3VsdAkyMDEwLTExLTAxIDA5OjUyOjA1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9mdW5j X3RpbWUucmVzdWx0CTIwMTAtMTEtMjUgMTI6Mzc6MDggKzAwMDAKQEAgLTEzNzIsMyArMTM3Miwx MyBAQCBkYXRlX2RhdGUKIFNFTEVDVCAqIEZST00gdDEgV0hFUkUgZGF0ZV9kYXRlIDw9IGFkZHRp bWUoZGF0ZV9hZGQoIjIwMDAtMS0xIiwgSU5URVJWQUwgIjE6MToxIiBIT1VSX1NFQ09ORCksICIw MDoyMDowMCIpOwogZGF0ZV9kYXRlCiBEUk9QIFRBQkxFIHQxOworIworIyBCdWcjNTc1MTIgc3Ry X3RvX2RhdGUgY3Jhc2guLi4KKyMKK1NFTEVDVCBXRUVLKFNUUl9UT19EQVRFKE5VTEwsMCkpOwor V0VFSyhTVFJfVE9fREFURShOVUxMLDApKQorTlVMTAorU0VMRUNUIFNVQkRBVEUoU1RSX1RPX0RB VEUoTlVMTCwwKSwgSU5URVJWQUwgMSBIT1VSKTsKK1NVQkRBVEUoU1RSX1RPX0RBVEUoTlVMTCww KSwgSU5URVJWQUwgMSBIT1VSKQorTlVMTAorIwoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRl c3QvdC9mdW5jX3RpbWUudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L2Z1bmNfdGltZS50ZXN0CTIw MTAtMTEtMDEgMDk6NTI6MDUgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2Z1bmNfdGltZS50ZXN0 CTIwMTAtMTEtMjUgMTI6Mzc6MDggKzAwMDAKQEAgLTg3MywzICs4NzMsMTMgQEAgSU5TRVJUIElO VE8gdDEgVkFMVUVTICgnMjAwOC0wMS0wMyAwMDowMAogU0VMRUNUICogRlJPTSB0MSBXSEVSRSBk YXRlX2RhdGUgPj0gc3VidGltZShub3coKSwgIjAwOjMwOjAwIik7CiBTRUxFQ1QgKiBGUk9NIHQx IFdIRVJFIGRhdGVfZGF0ZSA8PSBhZGR0aW1lKGRhdGVfYWRkKCIyMDAwLTEtMSIsIElOVEVSVkFM ICIxOjE6MSIgSE9VUl9TRUNPTkQpLCAiMDA6MjA6MDAiKTsKIERST1AgVEFCTEUgdDE7CisKKy0t ZWNobyAjCistLWVjaG8gIyBCdWcjNTc1MTIgc3RyX3RvX2RhdGUgY3Jhc2guLi4KKy0tZWNobyAj CisKK1NFTEVDVCBXRUVLKFNUUl9UT19EQVRFKE5VTEwsMCkpOworU0VMRUNUIFNVQkRBVEUoU1RS X1RPX0RBVEUoTlVMTCwwKSwgSU5URVJWQUwgMSBIT1VSKTsKKworLS1lY2hvICMKKwoKPT09IG1v ZGlmaWVkIGZpbGUgJ3NxbC9pdGVtX3RpbWVmdW5jLmNjJwotLS0gYS9zcWwvaXRlbV90aW1lZnVu Yy5jYwkyMDEwLTEwLTA3IDEwOjI2OjU3ICswMDAwCisrKyBiL3NxbC9pdGVtX3RpbWVmdW5jLmNj CTIwMTAtMTEtMjUgMTI6Mzc6MDggKzAwMDAKQEAgLTM0NjUsNyArMzQ2NSw3IEBAIGJvb2wgSXRl bV9mdW5jX3N0cl90b19kYXRlOjpnZXRfZGF0ZShNWVMKICAgcmV0dXJuIDA7CiAKIG51bGxfZGF0 ZToKLSAgaWYgKGZ1enp5X2RhdGUgJiBUSU1FX05PX1pFUk9fREFURSkKKyAgaWYgKHZhbCAmJiAo ZnV6enlfZGF0ZSAmIFRJTUVfTk9fWkVST19EQVRFKSkKICAgewogICAgIGNoYXIgYnVmZlsxMjhd OwogICAgIHN0cm1ha2UoYnVmZiwgdmFsLT5wdHIoKSwgbWluKHZhbC0+bGVuZ3RoKCksIHNpemVv ZihidWZmKS0xKSk7CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMp Lg==