From: Jon Olav Hauglid Date: April 10 2012 9:06am Subject: bzr push into mysql-trunk branch (jon.hauglid:3856 to 3857) WL#6255 List-Archive: http://lists.mysql.com/commits/143436 Message-Id: <201204100907.q3A97Dc9002561@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM4NTcgSm9uIE9sYXYgSGF1Z2xpZAkyMDEyLTA0LTEwCiAgICAgIFdMIzYyNTUgT25saW5lIEFM VEVSIFRBQkxF4oCmTU9ESUZZ4oCmTk9UIE5VTEwsIEFERCBGT1JFSUdOIEtFWQogICAgICAKICAg ICAgUHJlLXJlcXVpc2l0ZSBwYXRjaC4KICAgICAgCiAgICAgIFRoaXMgcGF0Y2ggc3BsaXRzIHRo ZSBBbHRlcl9pbnBsYWNlX2luZm8gaGFuZGxlciBmbGFnCiAgICAgIEFMVEVSX0NPTFVNTl9OVUxM QUJMRSBpbiB0d28gLSBBTFRFUl9DT0xVTU5fTlVMTEFCTEUKICAgICAgZm9yIGNoYW5naW5nIGEg Tk9UIE5VTEwgY29sdW1uIHRvIE5VTEwsIGFuZAogICAgICBBTFRFUl9DT0xVTU5fTk9UX05VTExB QkxFIGZvciBjaGFuZ2luZyBhIE5VTEwgY29sdW1uCiAgICAgIHRvIE5PVCBOVUxMLiBUaGlzIGlz IGRvbmUgdG8gbWFrZSBpdCBlYXNpZXIgZm9yIHN0b3JhZ2UKICAgICAgZW5naW5lcyBhcyB0aGVz ZSB0d28gb3BlcmF0aW9ucyBoYXZlIGRpZmZlcmVudCByZXF1aXJlbWVudHMuCgogICAgbW9kaWZp ZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9hbHRlcl90YWJsZS5yZXN1bHQKICAgICAgbXlzcWwtdGVz dC90L2FsdGVyX3RhYmxlLnRlc3QKICAgICAgc3FsL2hhbmRsZXIuaAogICAgICBzcWwvc3FsX3Rh YmxlLmNjCiAzODU2IE1hbmlzaCBLdW1hcgkyMDEyLTA0LTEwIFttZXJnZV0KICAgICAgdXBtZXJn ZSBmcm9tIG15c3FsLTUuNSAtPiBteXNxbC10cnVuawogICAgIEAgbXlzcWwtdGVzdC9zdWl0ZS9y cGwvci9ycGxfcmVwb3J0X3BvcnQucmVzdWx0CiAgICAgICAgVXBkYXRlZCB0aGUgY29ycmVzcG9u ZGluZyByZXN1bHQgZmlsZS4KICAgICBAIG15c3FsLXRlc3Qvc3VpdGUvcnBsL3QvcnBsX3JlcG9y dF9wb3J0LnRlc3QKICAgICAgICBBZGRlZCB0aGUgcmVzdGFydCBzZXJ2ZXIgb3B0aW9uIGJlZm9y ZSBlbmRpbmcgdGhlIHRlc3QuCgogICAgcmVtb3ZlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9y cGwvdC9ycGxfcmVwb3J0X3BvcnQtc2xhdmUub3B0CiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwt dGVzdC9zdWl0ZS9ycGwvci9ycGxfcmVwb3J0X3BvcnQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qv c3VpdGUvcnBsL3QvcnBsX3JlcG9ydF9wb3J0LnRlc3QKPT09IG1vZGlmaWVkIGZpbGUgJ215c3Fs LXRlc3Qvci9hbHRlcl90YWJsZS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvci9hbHRlcl90YWJs ZS5yZXN1bHQJMjAxMi0wMy0wOCAxNDoyMjowNyArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvYWx0 ZXJfdGFibGUucmVzdWx0CTIwMTItMDQtMTAgMDg6NDU6NTUgKzAwMDAKQEAgLTE3NDcsNiArMTc0 NywxMiBAQCBpbmZvOiBSZWNvcmRzOiAyICBEdXBsaWNhdGVzOiAwICBXYXJuaW5nCiBBTFRFUiBU QUJMRSB0bTEgTU9ESUZZIENPTFVNTiBjIElOVCBOT1QgTlVMTDsKIGFmZmVjdGVkIHJvd3M6IDIK IGluZm86IFJlY29yZHM6IDIgIER1cGxpY2F0ZXM6IDAgIFdhcm5pbmdzOiAwCitBTFRFUiBUQUJM RSB0aTEgTU9ESUZZIENPTFVNTiBjIElOVCBOVUxMOworYWZmZWN0ZWQgcm93czogMgoraW5mbzog UmVjb3JkczogMiAgRHVwbGljYXRlczogMCAgV2FybmluZ3M6IDAKK0FMVEVSIFRBQkxFIHRtMSBN T0RJRlkgQ09MVU1OIGMgSU5UIE5VTEw7CithZmZlY3RlZCByb3dzOiAyCitpbmZvOiBSZWNvcmRz OiAyICBEdXBsaWNhdGVzOiAwICBXYXJuaW5nczogMAogQUxURVIgVEFCTEUgdGkxIE1PRElGWSBD T0xVTU4gaCBWQVJDSEFSKDMwKTsKIGFmZmVjdGVkIHJvd3M6IDIKIGluZm86IFJlY29yZHM6IDIg IER1cGxpY2F0ZXM6IDAgIFdhcm5pbmdzOiAwCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVz dC90L2FsdGVyX3RhYmxlLnRlc3QnCi0tLSBhL215c3FsLXRlc3QvdC9hbHRlcl90YWJsZS50ZXN0 CTIwMTItMDItMDEgMTQ6MDk6MzQgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L2FsdGVyX3RhYmxl LnRlc3QJMjAxMi0wNC0xMCAwODo0NTo1NSArMDAwMApAQCAtMTQ3Niw5ICsxNDc2LDEyIEBAIEFM VEVSIFRBQkxFIHRpMSBNT0RJRlkgQ09MVU1OIGUgSU5UIEFGVEUKIEFMVEVSIFRBQkxFIHRtMSBN T0RJRlkgQ09MVU1OIGUgSU5UIEFGVEVSIGg7CiBBTFRFUiBUQUJMRSB0aTEgTU9ESUZZIENPTFVN TiBlIElOVCBGSVJTVDsKIEFMVEVSIFRBQkxFIHRtMSBNT0RJRlkgQ09MVU1OIGUgSU5UIEZJUlNU OwotIyBUaGlzIHdpbGwgc2V0IGJvdGggQUxURVJfQ09MVU1OX05VTExBQkxFIGFuZCBDT0xVTU5f REVGQVVMVF9WQUxVRQorIyBUaGlzIHdpbGwgc2V0IGJvdGggQUxURVJfQ09MVU1OX05PVF9OVUxM QUJMRSBhbmQgQ09MVU1OX0RFRkFVTFRfVkFMVUUKIEFMVEVSIFRBQkxFIHRpMSBNT0RJRlkgQ09M VU1OIGMgSU5UIE5PVCBOVUxMOwogQUxURVIgVEFCTEUgdG0xIE1PRElGWSBDT0xVTU4gYyBJTlQg Tk9UIE5VTEw7CisjIFRoaXMgd2lsbCBzZXQgYm90aCBBTFRFUl9DT0xVTU5fTlVMTEFCTEUgYW5k IENPTFVNTl9ERUZBVUxUX1ZBTFVFCitBTFRFUiBUQUJMRSB0aTEgTU9ESUZZIENPTFVNTiBjIElO VCBOVUxMOworQUxURVIgVEFCTEUgdG0xIE1PRElGWSBDT0xVTU4gYyBJTlQgTlVMTDsKICMgVGhp cyB3aWxsIHNldCBib3RoIEFMVEVSX0NPTFVNTl9FUVVBTF9QQUNLX0xFTkdUSCBhbmQgQ09MVU1O X0RFRkFVTFRfVkFMVUUKIEFMVEVSIFRBQkxFIHRpMSBNT0RJRlkgQ09MVU1OIGggVkFSQ0hBUigz MCk7CiBBTFRFUiBUQUJMRSB0bTEgTU9ESUZZIENPTFVNTiBoIFZBUkNIQVIoMzApOwoKPT09IG1v ZGlmaWVkIGZpbGUgJ3NxbC9oYW5kbGVyLmgnCi0tLSBhL3NxbC9oYW5kbGVyLmgJMjAxMi0wMy0y OCAxMToyNTozNyArMDAwMAorKysgYi9zcWwvaGFuZGxlci5oCTIwMTItMDQtMTAgMDg6NDU6NTUg KzAwMDAKQEAgLTk5NiwyMyArOTk2LDI2IEBAIHB1YmxpYzoKICAgLy8gUmVvcmRlciBjb2x1bW4K ICAgc3RhdGljIGNvbnN0IEhBX0FMVEVSX0ZMQUdTIEFMVEVSX0NPTFVNTl9PUkRFUiAgICAgICAg ID0gMUwgPDwgMTE7CiAKLSAgLy8gQ2hhbmdlIGNvbHVtbiBmcm9tIE5VTEwgdG8gTk9UIE5VTEwg b3IgdmljZSB2ZXJzYQorICAvLyBDaGFuZ2UgY29sdW1uIGZyb20gTk9UIE5VTEwgdG8gTlVMTAog ICBzdGF0aWMgY29uc3QgSEFfQUxURVJfRkxBR1MgQUxURVJfQ09MVU1OX05VTExBQkxFICAgICAg PSAxTCA8PCAxMjsKIAorICAvLyBDaGFuZ2UgY29sdW1uIGZyb20gTlVMTCB0byBOT1QgTlVMTAor ICBzdGF0aWMgY29uc3QgSEFfQUxURVJfRkxBR1MgQUxURVJfQ09MVU1OX05PVF9OVUxMQUJMRSAg PSAxTCA8PCAxMzsKKwogICAvLyBTZXQgb3IgcmVtb3ZlIGRlZmF1bHQgY29sdW1uIHZhbHVlCi0g IHN0YXRpYyBjb25zdCBIQV9BTFRFUl9GTEFHUyBBTFRFUl9DT0xVTU5fREVGQVVMVCAgICAgICA9 IDFMIDw8IDEzOworICBzdGF0aWMgY29uc3QgSEFfQUxURVJfRkxBR1MgQUxURVJfQ09MVU1OX0RF RkFVTFQgICAgICAgPSAxTCA8PCAxNDsKIAogICAvLyBBZGQgZm9yZWlnbiBrZXkKLSAgc3RhdGlj IGNvbnN0IEhBX0FMVEVSX0ZMQUdTIEFERF9GT1JFSUdOX0tFWSAgICAgICAgICAgID0gMUwgPDwg MTQ7CisgIHN0YXRpYyBjb25zdCBIQV9BTFRFUl9GTEFHUyBBRERfRk9SRUlHTl9LRVkgICAgICAg ICAgICA9IDFMIDw8IDE1OwogCiAgIC8vIERyb3AgZm9yZWlnbiBrZXkKLSAgc3RhdGljIGNvbnN0 IEhBX0FMVEVSX0ZMQUdTIERST1BfRk9SRUlHTl9LRVkgICAgICAgICAgID0gMUwgPDwgMTU7Cisg IHN0YXRpYyBjb25zdCBIQV9BTFRFUl9GTEFHUyBEUk9QX0ZPUkVJR05fS0VZICAgICAgICAgICA9 IDFMIDw8IDE2OwogCiAgIC8vIHRhYmxlX29wdGlvbnMgY2hhbmdlZCwgc2VlIEhBX0NSRUFURV9J TkZPOjp1c2VkX2ZpZWxkcyBmb3IgZGV0YWlscy4KLSAgc3RhdGljIGNvbnN0IEhBX0FMVEVSX0ZM QUdTIENIQU5HRV9DUkVBVEVfT1BUSU9OICAgICAgID0gMUwgPDwgMTY7CisgIHN0YXRpYyBjb25z dCBIQV9BTFRFUl9GTEFHUyBDSEFOR0VfQ1JFQVRFX09QVElPTiAgICAgICA9IDFMIDw8IDE3Owog CiAgIC8vIFRhYmxlIGlzIHJlbmFtZWQKLSAgc3RhdGljIGNvbnN0IEhBX0FMVEVSX0ZMQUdTIEFM VEVSX1JFTkFNRSAgICAgICAgICAgICAgID0gMUwgPDwgMTc7CisgIHN0YXRpYyBjb25zdCBIQV9B TFRFUl9GTEFHUyBBTFRFUl9SRU5BTUUgICAgICAgICAgICAgICA9IDFMIDw8IDE4OwogCiAgIC8q KgogICAgIENyZWF0ZSBvcHRpb25zIChsaWtlIE1BWF9ST1dTKSBmb3IgdGhlIG5ldyB2ZXJzaW9u IG9mIHRhYmxlLgoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfdGFibGUuY2MnCi0tLSBhL3Nx bC9zcWxfdGFibGUuY2MJMjAxMi0wMy0yMyAwOTo1Njo1NSArMDAwMAorKysgYi9zcWwvc3FsX3Rh YmxlLmNjCTIwMTItMDQtMTAgMDg6NDU6NTUgKzAwMDAKQEAgLTUzNDAsNyArNTM0MCwxNCBAQCBz dGF0aWMgYm9vbCBmaWxsX2FsdGVyX2lucGxhY2VfaW5mbyhUSEQKICAgICAgIC8qIENoZWNrIHRo YXQgTlVMTCBiZWhhdmlvciBpcyBzYW1lIGZvciBvbGQgYW5kIG5ldyBmaWVsZHMgKi8KICAgICAg IGlmICgobmV3X2ZpZWxkLT5mbGFncyAmIE5PVF9OVUxMX0ZMQUcpICE9CiAgICAgICAgICAgKHVp bnQpIChmaWVsZC0+ZmxhZ3MgJiBOT1RfTlVMTF9GTEFHKSkKLSAgICAgICAgaGFfYWx0ZXJfaW5m by0+aGFuZGxlcl9mbGFnc3w9IEFsdGVyX2lucGxhY2VfaW5mbzo6QUxURVJfQ09MVU1OX05VTExB QkxFOworICAgICAgeworICAgICAgICBpZiAobmV3X2ZpZWxkLT5mbGFncyAmIE5PVF9OVUxMX0ZM QUcpCisgICAgICAgICAgaGFfYWx0ZXJfaW5mby0+aGFuZGxlcl9mbGFnc3w9CisgICAgICAgICAg ICBBbHRlcl9pbnBsYWNlX2luZm86OkFMVEVSX0NPTFVNTl9OT1RfTlVMTEFCTEU7CisgICAgICAg IGVsc2UKKyAgICAgICAgICBoYV9hbHRlcl9pbmZvLT5oYW5kbGVyX2ZsYWdzfD0KKyAgICAgICAg ICAgIEFsdGVyX2lucGxhY2VfaW5mbzo6QUxURVJfQ09MVU1OX05VTExBQkxFOworICAgICAgfQog CiAgICAgICAvKgogICAgICAgICBXZSBkbyBub3QgZGV0ZWN0IGNoYW5nZXMgdG8gZGVmYXVsdCB2 YWx1ZXMgaW4gdGhpcyBsb29wLgoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2gg ZW1haWxzKS4=