From: Jon Olav Hauglid Date: October 4 2012 8:51am Subject: bzr push into mysql-trunk branch (jon.hauglid:4624 to 4625) List-Archive: http://lists.mysql.com/commits/144946 Message-Id: <20121004085133.774.60481.4625@atum08.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQ2MjUgSm9uIE9sYXYgSGF1Z2xpZAkyMDEyLTEwLTA0IFttZXJnZV0KICAgICAgTWVyZ2UgZnJv bSBteXNxbC01LjYgdG8gbXlzcWwtdHJ1bmsKICAgICAgTm8gY29uZmxpY3RzCgogICAgbW9kaWZp ZWQ6CiAgICAgIHNxbC9zcF9yY29udGV4dC5jYwogICAgICBzcWwvc3BfcmNvbnRleHQuaAogNDYy NCBNYXJrbyBNw6RrZWzDpAkyMDEyLTEwLTA0IFttZXJnZV0KICAgICAgTnVsbCBtZXJnZSBteXNx bC01LjYgdG8gbXlzcWwtdHJ1bmsuCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NwX3Jjb250ZXh0 LmNjJwotLS0gYS9zcWwvc3BfcmNvbnRleHQuY2MJMjAxMi0wNi0wNiAxMjoxMjo1MSArMDAwMAor KysgYi9zcWwvc3BfcmNvbnRleHQuY2MJMjAxMi0xMC0wNCAwODoyMTozMCArMDAwMApAQCAtNDgs NyArNDgsMTAgQEAgc3BfcmNvbnRleHQ6On5zcF9yY29udGV4dCgpCiAgIGlmIChtX3Zhcl90YWJs ZSkKICAgICBmcmVlX2Jsb2JzKG1fdmFyX3RhYmxlKTsKIAotICAvLyBMZWF2ZSBtX3Zpc2libGVf aGFuZGxlcnMsIG1fYWN0aXZhdGVkX2hhbmRsZXJzLCBtX3Zhcl9pdGVtcywgbV9jc3RhY2sKKyAg d2hpbGUgKG1fYWN0aXZhdGVkX2hhbmRsZXJzLmVsZW1lbnRzKCkpCisgICAgZGVsZXRlIG1fYWN0 aXZhdGVkX2hhbmRsZXJzLnBvcCgpOworCisgIC8vIExlYXZlIG1fdmlzaWJsZV9oYW5kbGVycywg bV92YXJfaXRlbXMsIG1fY3N0YWNrCiAgIC8vIGFuZCBtX2Nhc2VfZXhwcl9ob2xkZXJzIHVudG91 Y2hlZC4KICAgLy8gVGhleSBhcmUgYWxsb2NhdGVkIGluIG1lbSByb290cyBhbmQgd2lsbCBiZSBm cmVlZCBhY2NvcmRpbmdseS4KIH0KQEAgLTIwOSw3ICsyMTIsNyBAQCB2b2lkIHNwX3Jjb250ZXh0 OjpleGl0X2hhbmRsZXIoc3BfcGNvbnRlCiB7CiAgIC8vIFBvcCB0aGUgY3VycmVudCBoYW5kbGVy IGZyYW1lLgogCi0gIG1fYWN0aXZhdGVkX2hhbmRsZXJzLnBvcCgpOworICBkZWxldGUgbV9hY3Rp dmF0ZWRfaGFuZGxlcnMucG9wKCk7CiAKICAgLy8gUG9wIGZyYW1lcyBiZWxvdyB0aGUgdGFyZ2V0 IHNjb3BlIGxldmVsLgogCkBAIC0yMTgsNyArMjIxLDcgQEAgdm9pZCBzcF9yY29udGV4dDo6ZXhp dF9oYW5kbGVyKHNwX3Bjb250ZQogICAgIGludCBoYW5kbGVyX2xldmVsPSBtX2FjdGl2YXRlZF9o YW5kbGVycy5hdChpKS0+aGFuZGxlci0+c2NvcGUtPmdldF9sZXZlbCgpOwogCiAgICAgaWYgKGhh bmRsZXJfbGV2ZWwgPiB0YXJnZXRfc2NvcGUtPmdldF9sZXZlbCgpKQotICAgICAgbV9hY3RpdmF0 ZWRfaGFuZGxlcnMucG9wKCk7CisgICAgICBkZWxldGUgbV9hY3RpdmF0ZWRfaGFuZGxlcnMucG9w KCk7CiAgIH0KIH0KIApAQCAtMzU0LDEzICszNTcsOSBAQCBib29sIHNwX3Jjb250ZXh0OjpoYW5k bGVfc3FsX2NvbmRpdGlvbihUCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIChl LmcuICJiYWQgZGF0YSIpLgogCiAgIC8qIEFkZCBhIGZyYW1lIHRvIGhhbmRsZXItY2FsbC1zdGFj ay4gKi8KLSAgU3FsX2NvbmRpdGlvbl9pbmZvICpjb25kX2luZm89Ci0gICAgbmV3IChjYWxsZXJz X2FyZW5hLT5tZW1fcm9vdCkgU3FsX2NvbmRpdGlvbl9pbmZvKGZvdW5kX2NvbmRpdGlvbiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2FsbGVy c19hcmVuYSk7Ci0gIEhhbmRsZXJfY2FsbF9mcmFtZSAqZnJhbWU9Ci0gICAgbmV3IChjYWxsZXJz X2FyZW5hLT5tZW1fcm9vdCkgSGFuZGxlcl9jYWxsX2ZyYW1lKGZvdW5kX2hhbmRsZXIsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbmRfaW5m bywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29udGludWVfaXApOworICBIYW5kbGVyX2NhbGxfZnJhbWUgKmZyYW1lPSBuZXcgSGFuZGxlcl9j YWxsX2ZyYW1lKGZvdW5kX2hhbmRsZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZm91bmRfY29uZGl0aW9uLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlX2lwKTsKICAgbV9hY3Rp dmF0ZWRfaGFuZGxlcnMuYXBwZW5kKGZyYW1lKTsKIAogICAqaXA9IGhhbmRsZXJfZW50cnktPmZp cnN0X2lwOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcF9yY29udGV4dC5oJwotLS0gYS9zcWwv c3BfcmNvbnRleHQuaAkyMDEyLTA2LTA2IDEyOjEyOjUxICswMDAwCisrKyBiL3NxbC9zcF9yY29u dGV4dC5oCTIwMTItMTAtMDQgMDg6MjE6MzAgKzAwMDAKQEAgLTExMyw3ICsxMTMsNyBAQCBwdWJs aWM6CiAgIC8vLyBzdGFuZGFyZCBTUUwtY29uZGl0aW9uIHByb2Nlc3NpbmcgKERpYWdub3N0aWNz X2FyZWEgc2hvdWxkIGNvbnRhaW4gYW4KICAgLy8vIG9iamVjdCBmb3IgYWN0aXZlIFNRTC1jb25k aXRpb24sIG5vdCBqdXN0IGluZm9ybWF0aW9uIHN0b3JlZCBpbiBEQSdzCiAgIC8vLyBmaWVsZHMp LgotICBjbGFzcyBTcWxfY29uZGl0aW9uX2luZm8gOiBwdWJsaWMgU3FsX2FsbG9jCisgIGNsYXNz IFNxbF9jb25kaXRpb25faW5mbwogICB7CiAgIHB1YmxpYzoKICAgICAvLy8gU1FMIGVycm9yIGNv ZGUuCkBAIC0xMjYsMjEgKzEyNiwyMCBAQCBwdWJsaWM6CiAgICAgY2hhciBzcWxfc3RhdGVbU1FM U1RBVEVfTEVOR1RIICsgMV07CiAKICAgICAvLy8gVGV4dCBtZXNzYWdlLgotICAgIGNoYXIgKm1l c3NhZ2U7CisgICAgY2hhciBtZXNzYWdlW01ZU1FMX0VSUk1TR19TSVpFXTsKIAogICAgIC8vLyBU aGUgY29uc3RydWN0b3IuCiAgICAgLy8vCiAgICAgLy8vIEBwYXJhbSBfc3FsX2NvbmRpdGlvbiAg VGhlIFNRTCBjb25kaXRpb24uCiAgICAgLy8vIEBwYXJhbSBhcmVuYSAgICAgICAgICAgUXVlcnkg YXJlbmEgZm9yIFNQCi0gICAgU3FsX2NvbmRpdGlvbl9pbmZvKGNvbnN0IFNxbF9jb25kaXRpb24g Kl9zcWxfY29uZGl0aW9uLAotICAgICAgICAgICAgICAgICAgICAgICBRdWVyeV9hcmVuYSAqYXJl bmEpCisgICAgU3FsX2NvbmRpdGlvbl9pbmZvKGNvbnN0IFNxbF9jb25kaXRpb24gKl9zcWxfY29u ZGl0aW9uKQogICAgICAgOnNxbF9lcnJubyhfc3FsX2NvbmRpdGlvbi0+Z2V0X3NxbF9lcnJubygp KSwKICAgICAgICBsZXZlbChfc3FsX2NvbmRpdGlvbi0+Z2V0X2xldmVsKCkpCiAgICAgewogICAg ICAgbWVtY3B5KHNxbF9zdGF0ZSwgX3NxbF9jb25kaXRpb24tPmdldF9zcWxzdGF0ZSgpLCBTUUxT VEFURV9MRU5HVEgpOwogICAgICAgc3FsX3N0YXRlW1NRTFNUQVRFX0xFTkdUSF09ICdcMCc7CiAK LSAgICAgIG1lc3NhZ2U9IHN0cmR1cF9yb290KGFyZW5hLT5tZW1fcm9vdCwgX3NxbF9jb25kaXRp b24tPmdldF9tZXNzYWdlX3RleHQoKSk7CisgICAgICBzdHJuY3B5KG1lc3NhZ2UsIF9zcWxfY29u ZGl0aW9uLT5nZXRfbWVzc2FnZV90ZXh0KCksIE1ZU1FMX0VSUk1TR19TSVpFKTsKICAgICB9CiAg IH07CiAKQEAgLTE0OCwxNCArMTQ3LDE0IEBAIHByaXZhdGU6CiAgIC8vLyBUaGlzIGNsYXNzIHJl cHJlc2VudHMgYSBjYWxsIGZyYW1lIG9mIFNRTC1oYW5kbGVyIChvbmUgaW52b2NhdGlvbiBvZiBh CiAgIC8vLyBoYW5kbGVyKS4gQmFzaWNhbGx5LCBpdCdzIG5lZWRlZCB0byBzdG9yZSBjb250aW51 ZSBpbnN0cnVjdGlvbiBwb2ludGVyIGZvcgogICAvLy8gQ09OVElOVUUgU1FMLWhhbmRsZXJzLgot ICBjbGFzcyBIYW5kbGVyX2NhbGxfZnJhbWUgOiBwdWJsaWMgU3FsX2FsbG9jCisgIGNsYXNzIEhh bmRsZXJfY2FsbF9mcmFtZQogICB7CiAgIHB1YmxpYzoKICAgICAvLy8gSGFuZGxlciBkZWZpbml0 aW9uIChmcm9tIHBhcnNpbmcgY29udGV4dCkuCiAgICAgY29uc3Qgc3BfaGFuZGxlciAqaGFuZGxl cjsKIAogICAgIC8vLyBTUUwtY29uZGl0aW9uLCB0cmlnZ2VyZWQgaGFuZGxlciBhY3RpdmF0aW9u LgotICAgIGNvbnN0IFNxbF9jb25kaXRpb25faW5mbyAqc3FsX2NvbmRpdGlvbjsKKyAgICBjb25z dCBTcWxfY29uZGl0aW9uX2luZm8gc3FsX2NvbmRpdGlvbjsKIAogICAgIC8vLyBDb250aW51ZS1p bnN0cnVjdGlvbi1wb2ludGVyIGZvciBDT05USU5VRS1oYW5kbGVycy4KICAgICAvLy8gVGhlIGF0 dHJpYnV0ZSBjb250YWlucyAwIGZvciBFWElULWhhbmRsZXJzLgpAQCAtMTY2LDcgKzE2NSw3IEBA IHByaXZhdGU6CiAgICAgLy8vIEBwYXJhbSBfc3FsX2NvbmRpdGlvbiBTUUwtY29uZGl0aW9uLCB0 cmlnZ2VyZWQgaGFuZGxlciBhY3RpdmF0aW9uLgogICAgIC8vLyBAcGFyYW0gX2NvbnRpbnVlX2lw ICAgQ29udGludWUgaW5zdHJ1Y3Rpb24gcG9pbnRlci4KICAgICBIYW5kbGVyX2NhbGxfZnJhbWUo Y29uc3Qgc3BfaGFuZGxlciAqX2hhbmRsZXIsCi0gICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IFNxbF9jb25kaXRpb25faW5mbyAqX3NxbF9jb25kaXRpb24sCisgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IFNxbF9jb25kaXRpb24gKl9zcWxfY29uZGl0aW9uLAogICAgICAgICAgICAgICAg ICAgICAgICB1aW50IF9jb250aW51ZV9pcCkKICAgICAgOmhhbmRsZXIoX2hhbmRsZXIpLAogICAg ICAgc3FsX2NvbmRpdGlvbihfc3FsX2NvbmRpdGlvbiksCkBAIC0yMzAsNyArMjI5LDcgQEAgcHVi bGljOgogICBjb25zdCBTcWxfY29uZGl0aW9uX2luZm8gKnJhaXNlZF9jb25kaXRpb24oKSBjb25z dAogICB7CiAgICAgcmV0dXJuIG1fYWN0aXZhdGVkX2hhbmRsZXJzLmVsZW1lbnRzKCkgPwotICAg ICAgKCptX2FjdGl2YXRlZF9oYW5kbGVycy5iYWNrKCkpLT5zcWxfY29uZGl0aW9uIDogTlVMTDsK KyAgICAgICYoKm1fYWN0aXZhdGVkX2hhbmRsZXJzLmJhY2soKSktPnNxbF9jb25kaXRpb24gOiBO VUxMOwogICB9CiAKICAgLy8vIEhhbmRsZSBjdXJyZW50IFNRTCBjb25kaXRpb24gKGlmIGFueSku CgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==