From: Ole John Aske Date: May 11 2011 1:32pm Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4367 to 4368) List-Archive: http://lists.mysql.com/commits/137085 Message-Id: <20110511133202.90E76222@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDQzNjggT2xlIEpvaG4gQXNrZQkyMDExLTA1LTExCiAgICAgIFJlbW92ZSB1bnVzZWQgZmllbGQg JiBtZXRob2RzIGZyb24gJ2NsYXNzIE5kYlJlY2VpdmVyJwogICAgICAKICAgICAgMS4gTWV0aG9k IE5kYlJlY2VpdmVyOjpjb3B5b3V0KCkgaXMgdW51c2VkIC0+IHJlbW92ZQogICAgICAyLiBTdHJ1 Y3QgbV9yZWNhdHRyIGlzIHVudXNlZCBhZnRlciByZW1vdmFsIG9mIDo6Y29weW91dCgpIC0+IHJl bW92ZQogICAgICAzLiBGaWVsZCBtX3JlY29yZDo6bV9jb2x1bW5fY291bnQgaXMgdW51c2VkIC0+ cmVtb3ZlCiAgICAgIDQuIFVuaW9uIGVuY2xvc2luZyBtX3JlY2F0dHIgJiBtX3JlY29yZCBvbmx5 IGNvbnRhaW5zIG1fcmVjb3JkIGFmdGVyICczLicgLT4gcmVtb3ZlCiAgICAgIDUuIFJlbW92ZSBh cmd1bWVudCAnY29sdW1uX2NvdW50JyBmcm9tIDo6ZG9fc2V0dXBfbmRicmVjb3JkKCkgaXMgaXQK ICAgICAgICAgd2FzIHVzZWQgdG8gc2V0IHRoZSBvYnNvbGV0ZSAnbV9yZWNvcmQ6Om1fY29sdW1u X2NvdW50Jy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9uZGIvaW5jbHVkZS9uZGJhcGkv TmRiUmVjZWl2ZXIuaHBwCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvTmRiT3BlcmF0aW9u RXhlYy5jcHAKICAgICAgc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9OZGJRdWVyeU9wZXJhdGlvbi5j cHAKICAgICAgc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9OZGJSZWNlaXZlci5jcHAKICAgICAgc3Rv cmFnZS9uZGIvc3JjL25kYmFwaS9OZGJTY2FuT3BlcmF0aW9uLmNwcAogNDM2NyBNYWdudXMgQmzD pXVkZAkyMDExLTA1LTExIFttZXJnZV0KICAgICAgTWVyZ2UgaW4gcGF0Y2ggZm9yIGJ1ZyAxMjU0 MjEyMAoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL25kYi9zcmMvY29tbW9uL3BvcnRsaWIv Q01ha2VMaXN0cy50eHQKICAgICAgc3RvcmFnZS9uZGIvc3JjL2NvbW1vbi9wb3J0bGliL01ha2Vm aWxlLmFtCiAgICAgIHN0b3JhZ2UvbmRiL3NyYy9jb21tb24vcG9ydGxpYi9OZGJUQ1AuY3BwCj09 PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL25kYi9pbmNsdWRlL25kYmFwaS9OZGJSZWNlaXZlci5o cHAnCi0tLSBhL3N0b3JhZ2UvbmRiL2luY2x1ZGUvbmRiYXBpL05kYlJlY2VpdmVyLmhwcAkyMDEx LTAyLTA5IDE0OjE4OjUzICswMDAwCisrKyBiL3N0b3JhZ2UvbmRiL2luY2x1ZGUvbmRiYXBpL05k YlJlY2VpdmVyLmhwcAkyMDExLTA1LTExIDEzOjMxOjQ0ICswMDAwCkBAIC0xMTgsNyArMTE4LDcg QEAgcHJpdmF0ZToKICAgKi8KICAgdm9pZCBkb19zZXR1cF9uZGJyZWNvcmQoY29uc3QgTmRiUmVj b3JkICpuZGJfcmVjb3JkLCBVaW50MzIgYmF0Y2hfc2l6ZSwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgVWludDMyIGtleV9zaXplLCBVaW50MzIgcmVhZF9yYW5nZV9ubywKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgVWludDMyIHJvd3NpemUsIGNoYXIgKmJ1ZiwgVWludDMyIGNvbHVtbl9j b3VudCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgIFVpbnQzMiByb3dzaXplLCBjaGFyICpi dWYpOwogCiAgIHN0YXRpYwogICBVaW50MzIgbmRicmVjb3JkX3Jvd3NpemUoY29uc3QgTmRiUmVj b3JkICpuZGJfcmVjb3JkLApAQCAtMTM3LDMzICsxMzcsMjcgQEAgcHJpdmF0ZToKICAgICBuZXcg TmRiUmVjb3JkIHN0eWxlIG9wZXJhdGlvbi4KICAgKi8KICAgYm9vbCBtX3VzaW5nX25kYl9yZWNv cmQ7Ci0gIHVuaW9uIHsKLSAgICAvKiBtZW1iZXJzIHVzZWQgZm9yIE5kYlJlY0F0dHIgb3BlcmF0 aW9uLiAqLwotICAgIHN0cnVjdCB7Ci0gICAgICBVaW50MzIgbV9oaWRkZW5fY291bnQ7Ci0gICAg fSBtX3JlY2F0dHI7Ci0KLSAgICAvKiBtZW1iZXJzIHVzZWQgZm9yIE5kYlJlY29yZCBvcGVyYXRp b24uICovCi0gICAgc3RydWN0IHsKLSAgICAgIFVpbnQzMiBtX2NvbHVtbl9jb3VudDsKLSAgICAg IGNvbnN0IE5kYlJlY29yZCAqbV9uZGJfcmVjb3JkOwotICAgICAgY2hhciAqbV9yb3c7Ci0gICAg ICAvKiBCbG9jayBvZiBtZW1vcnkgdXNlZCB0byByZWNlaXZlIGFsbCByb3dzIGluIGEgYmF0Y2gg ZHVyaW5nIHNjYW4uICovCi0gICAgICBjaGFyICptX3Jvd19idWZmZXI7Ci0gICAgICAvKgotICAg ICAgICBPZmZzZXRzIGJldHdlZW4gdHdvIHJvd3MgaW4gbV9yb3dfYnVmZmVyLgotICAgICAgICBU aGlzIGNhbiBiZSBkaWZmZXJlbnQgZnJvbSBtX25kYl9yZWNvcmQtPm1fcm93X3NpemUsIGFzIHdl IHNvbWV0aW1lcwotICAgICAgICBzdG9yZSBleHRyYSBpbmZvcm1hdGlvbiBhZnRlciBlYWNoIHJv dyAocmFuZ2Vfbm8gYW5kIGtleWluZm8pLgotICAgICAgICBGb3Igbm9uLXNjYW4gb3BlcmF0aW9u cywgdGhpcyBpcyBzZXQgdG8gemVyby4KLSAgICAgICovCi0gICAgICBVaW50MzIgbV9yb3dfb2Zm c2V0OwotICAgICAgLyoKLSAgICAgICAgbV9yZWFkX3JhbmdlX25vIGlzIHRydWUgaWYgd2UgYXJl IHN0b3JpbmcgdGhlIHJhbmdlX25vIGF0IHRoZSBlbmQgb2YKLSAgICAgICAgZWFjaCByb3cgZHVy aW5nIHNjYW5zLgotICAgICAgKi8KLSAgICAgIGJvb2wgbV9yZWFkX3JhbmdlX25vOwotICAgIH0g bV9yZWNvcmQ7Ci0gIH07CisKKyAgLyogbWVtYmVycyB1c2VkIGZvciBOZGJSZWNvcmQgb3BlcmF0 aW9uLiAqLworICBzdHJ1Y3QgeworICAgIGNvbnN0IE5kYlJlY29yZCAqbV9uZGJfcmVjb3JkOwor ICAgIGNoYXIgKm1fcm93OworICAgIC8qIEJsb2NrIG9mIG1lbW9yeSB1c2VkIHRvIHJlY2VpdmUg YWxsIHJvd3MgaW4gYSBiYXRjaCBkdXJpbmcgc2Nhbi4gKi8KKyAgICBjaGFyICptX3Jvd19idWZm ZXI7CisgICAgLyoKKyAgICAgIE9mZnNldHMgYmV0d2VlbiB0d28gcm93cyBpbiBtX3Jvd19idWZm ZXIuCisgICAgICBUaGlzIGNhbiBiZSBkaWZmZXJlbnQgZnJvbSBtX25kYl9yZWNvcmQtPm1fcm93 X3NpemUsIGFzIHdlIHNvbWV0aW1lcworICAgICAgc3RvcmUgZXh0cmEgaW5mb3JtYXRpb24gYWZ0 ZXIgZWFjaCByb3cgKHJhbmdlX25vIGFuZCBrZXlpbmZvKS4KKyAgICAgIEZvciBub24tc2NhbiBv cGVyYXRpb25zLCB0aGlzIGlzIHNldCB0byB6ZXJvLgorICAgICovCisgICAgVWludDMyIG1fcm93 X29mZnNldDsKKyAgICAvKgorICAgICAgbV9yZWFkX3JhbmdlX25vIGlzIHRydWUgaWYgd2UgYXJl IHN0b3JpbmcgdGhlIHJhbmdlX25vIGF0IHRoZSBlbmQgb2YKKyAgICAgIGVhY2ggcm93IGR1cmlu ZyBzY2Fucy4KKyAgICAqLworICAgIGJvb2wgbV9yZWFkX3JhbmdlX25vOworICB9IG1fcmVjb3Jk OworCiAgIGNsYXNzIE5kYlJlY0F0dHIqIHRoZUZpcnN0UmVjQXR0cjsKICAgY2xhc3MgTmRiUmVj QXR0ciogdGhlQ3VycmVudFJlY0F0dHI7CiAKQEAgLTIxMiw3ICsyMDYsNiBAQCBwcml2YXRlOgog CiAgIGJvb2wgaGFzUmVzdWx0cygpIGNvbnN0IHsgcmV0dXJuIG1fcmVzdWx0X3Jvd3MgPiAwOyB9 CiAgIGJvb2wgbmV4dFJlc3VsdCgpIGNvbnN0IHsgcmV0dXJuIG1fY3VycmVudF9yb3cgPCBtX3Jl c3VsdF9yb3dzOyB9Ci0gIE5kYlJlY0F0dHIqIGNvcHlvdXQoTmRiUmVjZWl2ZXImKTsKICAgVWlu dDMyIHJlY2VpdmVfcGFja2VkX3JlY2F0dHIoTmRiUmVjQXR0cioqLCBVaW50MzIgYm1sZW4sIAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBVaW50MzIqIGFEYXRhUHRyLCBV aW50MzIgYUxlbmd0aCk7CiAgIFVpbnQzMiByZWNlaXZlX3BhY2tlZF9uZGJyZWNvcmQoVWludDMy IGJtbGVuLAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvTmRiT3Bl cmF0aW9uRXhlYy5jcHAnCi0tLSBhL3N0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvTmRiT3BlcmF0aW9u RXhlYy5jcHAJMjAxMS0wNC0yOCAwNzo0Nzo1MyArMDAwMAorKysgYi9zdG9yYWdlL25kYi9zcmMv bmRiYXBpL05kYk9wZXJhdGlvbkV4ZWMuY3BwCTIwMTEtMDUtMTEgMTM6MzE6NDQgKzAwMDAKQEAg LTEwMzIsNyArMTAzMiw2IEBAIE5kYk9wZXJhdGlvbjo6YnVpbGRTaWduYWxzTmRiUmVjb3JkKFVp bnQKICAgICAgIHJlYWRNYXNrLnNldChhdHRySWQpOwogICAgICAgcmVxdWVzdGVkQ29scysrOwog ICAgIH0KLSAgICB0aGVSZWNlaXZlci5tX3JlY29yZC5tX2NvbHVtbl9jb3VudD0gcmVxdWVzdGVk Q29sczsKIAogICAgIC8qIEFyZSB0aGVyZSBhbnkgY29sdW1ucyB0byByZWFkIHZpYSBOZGJSZWNv cmQ/ICovCiAgICAgaWYgKHJlcXVlc3RlZENvbHMgPiAwKQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0 b3JhZ2UvbmRiL3NyYy9uZGJhcGkvTmRiUXVlcnlPcGVyYXRpb24uY3BwJwotLS0gYS9zdG9yYWdl L25kYi9zcmMvbmRiYXBpL05kYlF1ZXJ5T3BlcmF0aW9uLmNwcAkyMDExLTA1LTA1IDExOjA2OjA4 ICswMDAwCisrKyBiL3N0b3JhZ2UvbmRiL3NyYy9uZGJhcGkvTmRiUXVlcnlPcGVyYXRpb24uY3Bw CTIwMTEtMDUtMTEgMTM6MzE6NDQgKzAwMDAKQEAgLTQwNjksOCArNDA2OSw3IEBAIE5kYlF1ZXJ5 T3BlcmF0aW9uSW1wbDo6cHJlcGFyZVJlY2VpdmVyKCkKICAgICAgICAgICAgICAgICAgICAgICAg ICAgMCAvKmtleV9zaXplKi8sIAogICAgICAgICAgICAgICAgICAgICAgICAgICAwIC8qcmVhZF9y YW5nZV9ubyovLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0Um93U2l6ZSgpLAotICAg ICAgICAgICAgICAgICAgICAgICAgICByb3dCdWYsCi0gICAgICAgICAgICAgICAgICAgICAgICAg IDApOworICAgICAgICAgICAgICAgICAgICAgICAgICByb3dCdWYpOwogICAgIG1fcmVzdWx0U3Ry ZWFtc1tpXS0+Z2V0UmVjZWl2ZXIoKS5wcmVwYXJlU2VuZCgpOwogICB9CiAgIC8vIFNvIHRoYXQg d2UgY2FuIHRlc3QgZm9yIGZvciBidWZmZXIgb3ZlcnJ1bi4KCj09PSBtb2RpZmllZCBmaWxlICdz dG9yYWdlL25kYi9zcmMvbmRiYXBpL05kYlJlY2VpdmVyLmNwcCcKLS0tIGEvc3RvcmFnZS9uZGIv c3JjL25kYmFwaS9OZGJSZWNlaXZlci5jcHAJMjAxMS0wNC0wNiAxNDoxNjoxMyArMDAwMAorKysg Yi9zdG9yYWdlL25kYi9zcmMvbmRiYXBpL05kYlJlY2VpdmVyLmNwcAkyMDExLTA1LTExIDEzOjMx OjQ0ICswMDAwCkBAIC02MCw3ICs2MCw2IEBAIE5kYlJlY2VpdmVyOjppbml0KFJlY2VpdmVyVHlw ZSB0eXBlLCBib28KICAgICBtX3JlY29yZC5tX3Jvd19idWZmZXI9IE5VTEw7CiAgICAgbV9yZWNv cmQubV9yb3dfb2Zmc2V0PSAwOwogICAgIG1fcmVjb3JkLm1fcmVhZF9yYW5nZV9ubz0gZmFsc2U7 Ci0gICAgbV9yZWNvcmQubV9jb2x1bW5fY291bnQ9IDA7CiAgIH0KICAgdGhlRmlyc3RSZWNBdHRy ID0gTlVMTDsKICAgdGhlQ3VycmVudFJlY0F0dHIgPSBOVUxMOwpAQCAtMjE2LDggKzIxNSw3IEBA IE5kYlJlY2VpdmVyOjpjYWxjdWxhdGVfYmF0Y2hfc2l6ZShVaW50MzIKIHZvaWQKIE5kYlJlY2Vp dmVyOjpkb19zZXR1cF9uZGJyZWNvcmQoY29uc3QgTmRiUmVjb3JkICpuZGJfcmVjb3JkLCBVaW50 MzIgYmF0Y2hfc2l6ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVWludDMyIGtl eV9zaXplLCBVaW50MzIgcmVhZF9yYW5nZV9ubywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgVWludDMyIHJvd3NpemUsIGNoYXIgKnJvd19idWZmZXIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFVpbnQzMiBjb2x1bW5fY291bnQpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFVpbnQzMiByb3dzaXplLCBjaGFyICpyb3dfYnVmZmVyKQogewogICBtX3Vz aW5nX25kYl9yZWNvcmQ9IHRydWU7CiAgIG1fcmVjb3JkLm1fbmRiX3JlY29yZD0gbmRiX3JlY29y ZDsKQEAgLTIyNSw3ICsyMjMsNiBAQCBOZGJSZWNlaXZlcjo6ZG9fc2V0dXBfbmRicmVjb3JkKGNv bnN0IE5kCiAgIG1fcmVjb3JkLm1fcm93X2J1ZmZlcj0gcm93X2J1ZmZlcjsKICAgbV9yZWNvcmQu bV9yb3dfb2Zmc2V0PSByb3dzaXplOwogICBtX3JlY29yZC5tX3JlYWRfcmFuZ2Vfbm89IHJlYWRf cmFuZ2Vfbm87Ci0gIG1fcmVjb3JkLm1fY29sdW1uX2NvdW50PSBjb2x1bW5fY291bnQ7CiB9CiAK IC8vc3RhdGljCkBAIC0yNjEsMjYgKzI1OCw2IEBAIE5kYlJlY2VpdmVyOjpuZGJyZWNvcmRfcm93 c2l6ZShjb25zdCBOZGIKICAgcmV0dXJuIHJvd3NpemU7CiB9CiAKLU5kYlJlY0F0dHIqCi1OZGJS ZWNlaXZlcjo6Y29weW91dChOZGJSZWNlaXZlciAmIGRzdFJlYyl7Ci0gIGFzc2VydCghbV91c2lu Z19uZGJfcmVjb3JkKTsKLSAgTmRiUmVjQXR0ciAqc3JjID0gbV9yb3dzW21fY3VycmVudF9yb3cr K107Ci0gIE5kYlJlY0F0dHIgKmRzdCA9IGRzdFJlYy50aGVGaXJzdFJlY0F0dHI7Ci0gIE5kYlJl Y0F0dHIgKnN0YXJ0ID0gc3JjOwotICBVaW50MzIgdG1wID0gbV9yZWNhdHRyLm1faGlkZGVuX2Nv dW50OwotICB3aGlsZSh0bXAtLSkKLSAgICBzcmMgPSBzcmMtPm5leHQoKTsKLSAgCi0gIHdoaWxl KGRzdCl7Ci0gICAgVWludDMyIGxlbiA9IHNyYy0+Z2V0X3NpemVfaW5fYnl0ZXMoKTsKLSAgICBk c3QtPnJlY2VpdmVfZGF0YSgoVWludDMyKilzcmMtPmFSZWYoKSwgbGVuKTsKLSAgICBzcmMgPSBz cmMtPm5leHQoKTsKLSAgICBkc3QgPSBkc3QtPm5leHQoKTsKLSAgfQotCi0gIHJldHVybiBzdGFy dDsKLX0KLQogLyoqCiAgKiBwYWQKICAqIFRoaXMgZnVuY3Rpb24gZGV0ZXJtaW5lcyBob3cgbXVj aCAncGFkZGluZycgc2hvdWxkIGJlIGFwcGxpZWQKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl L25kYi9zcmMvbmRiYXBpL05kYlNjYW5PcGVyYXRpb24uY3BwJwotLS0gYS9zdG9yYWdlL25kYi9z cmMvbmRiYXBpL05kYlNjYW5PcGVyYXRpb24uY3BwCTIwMTEtMDQtMjcgMTA6NDg6MTYgKzAwMDAK KysrIGIvc3RvcmFnZS9uZGIvc3JjL25kYmFwaS9OZGJTY2FuT3BlcmF0aW9uLmNwcAkyMDExLTA1 LTExIDEzOjMxOjQ0ICswMDAwCkBAIC0zOTUsOCArMzk1LDYgQEAgTmRiU2Nhbk9wZXJhdGlvbjo6 Z2VuZXJhdGVQYWNrZWRSZWFkQUlzKAogICAgIGNvbHVtbkNvdW50Kys7CiAgIH0KIAotICB0aGVS ZWNlaXZlci5tX3JlY29yZC5tX2NvbHVtbl9jb3VudD0gY29sdW1uQ291bnQ7Ci0KICAgaW50IHJl c3VsdD0gMDsKIAogICAvKiBBcmUgdGhlcmUgYW55IGNvbHVtbnMgdG8gcmVhZCB2aWEgTmRiUmVj b3JkPyAKQEAgLTIzMzUsOCArMjMzMyw3IEBAIGludCBOZGJTY2FuT3BlcmF0aW9uOjpwcmVwYXJl U2VuZFNjYW4oVWkKICAgewogICAgIG1fcmVjZWl2ZXJzW2ldLT5kb19zZXR1cF9uZGJyZWNvcmQo bV9hdHRyaWJ1dGVfcmVjb3JkLCBiYXRjaF9zaXplLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAga2V5X3NpemUsIG1fcmVhZF9yYW5nZV9ubywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJvd3NpemUsIGJ1ZiwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHRoZVJlY2VpdmVyLm1fcmVjb3JkLm1fY29sdW1uX2NvdW50 KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvd3NpemUsIGJ1Zik7 CiAgICAgYnVmKz0gYnVmc2l6ZTsKICAgfQogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBm b3IgcHVzaCBlbWFpbHMpLg==