From: marko.makela Date: December 1 2010 1:21pm Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3249 to 3250) Bug#58212 List-Archive: http://lists.mysql.com/commits/125658 X-Bug: 58212 Message-Id: <201012011321.oB1D5R3w030748@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1148974729==" --===============1148974729== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline IDMyNTAgTWFya28gTcOka2Vsw6QJMjAxMC0xMi0wMQogICAgICBCdWcjNTgyMTIgUG9zc2libGUg ZGVhZGxvY2sgaW4gY2hhbmdlIGJ1ZmZlciBpbiBkZWJ1ZyBidWlsZHMKICAgICAgCiAgICAgIGli dWZfcGFnZSgpOiBSZW5hbWVkIHRvIGlidWZfcGFnZV9sb3coKS4gQWRkIHRoZSBwYXJhbWV0ZXJz IGZpbGUsIGxpbmUKICAgICAgc28gdGhhdCB0aGUgbGF0Y2ggZGlhZ25vc3RpY3Mgd2lsbCBiZSBt b3JlIG1lYW5pbmdmdWwuCiAgICAgIEluIGRlYnVnIGJ1aWxkcywgYWRkIHRoZSBwYXJhbWV0ZXIg aWJvb2wgeF9sYXRjaC4gV2hlbiB4X2xhdGNoPUZBTFNFLAogICAgICBkbyBub3QgeC1sYXRjaCB0 aGUgcGFnZSwgYnV0IG9ubHkgYnVmZmVyLWZpeCBpdCBmb3IgcmVhZGluZyB0aGUgYml0LgogICAg ICBJbiBVTklWX1NZTkNfREVCVUcsIGRpc3BsYXkgYSBtZXNzYWdlIGlmIGFuIGluc2VydCBidWZm ZXIgYml0bWFwIHBhZ2UKICAgICAgd2FzIGFscmVhZHkgbGF0Y2hlZC4gKFRoZSBtZXNzYWdlIHNo b3VsZCBiZSBkaXNwbGF5ZWQgaW4gdGhvc2UgY2FzZXMKICAgICAgd2hlcmUgdGhlIGNvZGUgd291 bGQgaGF2ZSBwcmV2aW91c2x5IGZhaWxlZC4pCiAgICAgIAogICAgICBpYnVmX3BhZ2UoKTogQSB3 cmFwcGVyIG1hY3JvIGZvciBpYnVmX3BhZ2VfbG93KCkuIFBhc3MgeF9sYXRjaD1UUlVFLgogICAg ICAKICAgICAgaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0cygpOiBSZW5hbWVkIHRvIGlidWZfYml0 bWFwX3BhZ2VfZ2V0X2JpdHNfbG93KCkuCiAgICAgIEluIFVOSVZfREVCVUcsIGFkZCB0aGUgcGFy YW1ldGVyIGxhdGNoX21vZGUuCiAgICAgIFJlbW92ZSB0aGUgcGFyYW1ldGVyIG10ciB1bmxlc3Mg VU5JVl9ERUJVRyBpcyBkZWZpbmVkLgogICAgICAKICAgICAgaWJ1Zl9iaXRtYXBfcGFnZV9nZXRf Yml0cygpOiBBIHdyYXBwZXIgbWFjcm8gZm9yCiAgICAgIGlidWZfYml0bWFwX3BhZ2VfZ2V0X2Jp dHNfbG93KCkuIFBhc3MgbGF0Y2hfdHlwZT1NVFJfTUVNT19QQUdFX1hfRklYLgogICAgICAKICAg ICAgYnVmX3BhZ2VfZ2V0X2dlbigpOiBVc2UgaWJ1Zl9wYWdlX2xvdyh4X2xhdGNoPUZBTFNFKSBp biB0aGUgZGVidWcgYXNzZXJ0aW9uLgogICAgICBUaGlzIGF2b2lkcyB0aGUgcG9zc2libGUgZGVh ZGxvY2suCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYu YwogICAgICBzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmMKICAgICAgc3RvcmFnZS9p bm5vYmFzZS9pbmNsdWRlL2lidWYwaWJ1Zi5oCiAzMjQ5IE1hcmtvIE3DpGtlbMOkCTIwMTAtMTIt MDEKICAgICAgQnVnIzU4MjI2IFNvbWUgSW5ub0RCIGRlYnVnIGNoZWNrcyBjb25zdW1lIHRvbyBt dWNoIENQVSB0aW1lCiAgICAgIAogICAgICBEbyBub3QgZGlzYWJsZSBJbm5vREIgaW5saW5pbmcg d2hlbiBVTklWX0RFQlVHIGlzIGRlZmluZWQuIFRoZQogICAgICBpbmxpbmluZyBpcyBub3cgc29s ZWx5IGNvbnRyb2xsZWQgYnkgdGhlIHByZXByb2Nlc3NvciBzeW1ib2wKICAgICAgVU5JVl9NVVNU X05PVF9JTkxJTkUgYW5kIGJ5IGFueSBjb21waWxlciBvcHRpb25zLgogICAgICAKICAgICAgbXRy X21lbW9fY29udGFpbnMoKTogQWRkIGFuIGV4cGxpY2l0IHR5cGUgY29udmVyc2lvbiBmcm9tIHZv aWQqLCBzbwogICAgICB0aGF0IHRoZSBmdW5jdGlvbiBjYW4gYmUgY29tcGlsZWQgYnkgYSBDKysg Y29tcGlsZXIuIFByZXZpb3VzbHksIHRoaXMKICAgICAgZnVuY3Rpb24gd2FzIG5ldmVyIHNlZW4g YnkgdGhlIEMrKyBjb21waWxlciwgYmVjYXVzZSBpdCBpcyBvbmx5CiAgICAgIHByZXNlbnQgaW4g VU5JVl9ERUJVRyBidWlsZHMgYW5kIElubm9EQiBpbmxpbmluZyB1c2VkIHRvIGJlIGRpc2FibGVk LgogICAgICAKICAgICAgYnVmX2ZsdXNoX3ZhbGlkYXRlX3NraXAoKTogQSB3cmFwcGVyIHRoYXQg c2tpcHMgbW9zdCBjYWxscyBvZgogICAgICBidWZfZmx1c2hfdmFsaWRhdGVfbG93KCkuIEludm9r ZWQgYnkgZGVidWcgYXNzZXJ0aW9ucyBpbgogICAgICBidWZfZmx1c2hfaW5zZXJ0X2ludG9fZmx1 c2hfbGlzdCgpIGFuZCBidWZfZmx1c2hfcmVtb3ZlKCkuCiAgICAgIAogICAgICBmaWxfdmFsaWRh dGVfc2tpcCgpOiBBIHdyYXBwZXIgdGhhdCBza2lwcyBtb3N0IGNhbGxzIG9mCiAgICAgIGZpbF92 YWxpZGF0ZSgpLiBJbnZva2VkIGJ5IGRlYnVnIGFzc2VydGlvbnMgaW4gZmlsX2lvKCkgYW5kIGZp bF9pb193YWl0KCkuCiAgICAgIAogICAgICBvc19haW9fdmFsaWRhdGVfc2tpcCgpOiBBIHdyYXBw ZXIgdGhhdCBza2lwcyBtb3N0IGNhbGxzIG9mCiAgICAgIG9zX2Fpb192YWxpZGF0ZSgpLiBJbnZv a2VkIGJ5IGRlYnVnIGFzc2VydGlvbnMgaW4KICAgICAgb3NfYWlvX2Z1bmMoKSwgb3NfYWlvX3dp bmRvd3NfaGFuZGxlKCkgYW5kIG9zX2Fpb19zaW11bGF0ZWRfaGFuZGxlLgogICAgICAKICAgICAg b3NfZ2V0X29zX3ZlcnNpb24oKTogT25seSBpbmNsdWRlIHRoaXMgZnVuY3Rpb24gaWYgX19XSU5f XyBpcyBkZWZpbmVkLgogICAgICAKICAgICAgc3luY19hcnJheV9kZWFkbG9ja19zdGVwKCk6IFNs aWdodCBvcHRpbWl6YXRpb25zLiBUaGlzIGZ1bmN0aW9uIGlzIGEKICAgICAgbWFqb3IgQ1BVIGNv bnN1bWVyIGluIFVOSVZfU1lOQ19ERUJVRyBidWlsZHMuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0 b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBmbHUuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2ZpbC9m aWwwZmlsLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL210cjBtdHIuaWMKICAgICAg c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL29zMGZpbGUuaAogICAgICBzdG9yYWdlL2lubm9iYXNl L2luY2x1ZGUvdW5pdi5pCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5jCiAgICAg IHN0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMGFyci5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9y YWdlL2lubm9iYXNlL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1 ZjBidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4NDMzMy1jNWls a3Jld3FibGZvcGc3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWYuYwlyZXZpZDpt YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTEzMDkwMi1xMGc1NHVmaWkwNm9yNG9lCkBA IC0yNzQ1LDcgKzI3NDUsOCBAQCBidWZfcGFnZV9nZXRfZ2VuKAogCXV0X2FkKHppcF9zaXplID09 IGZpbF9zcGFjZV9nZXRfemlwX3NpemUoc3BhY2UpKTsKIAl1dF9hZCh1dF9pc18ycG93KHppcF9z aXplKSk7CiAjaWZuZGVmIFVOSVZfTE9HX0RFQlVHCi0JdXRfYWQoIWlidWZfaW5zaWRlKCkgfHwg aWJ1Zl9wYWdlKHNwYWNlLCB6aXBfc2l6ZSwgb2Zmc2V0LCBOVUxMKSk7CisJdXRfYWQoIWlidWZf aW5zaWRlKCkgfHwgaWJ1Zl9wYWdlX2xvdyhzcGFjZSwgemlwX3NpemUsIG9mZnNldCwKKwkJCQkJ ICAgICAgRkFMU0UsIGZpbGUsIGxpbmUsIE5VTEwpKTsKICNlbmRpZgogCWJ1Zl9wb29sLT5zdGF0 Lm5fcGFnZV9nZXRzKys7CiAJZm9sZCA9IGJ1Zl9wYWdlX2FkZHJlc3NfZm9sZChzcGFjZSwgb2Zm c2V0KTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVm LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDptYXJrby5t YWtlbGFAb3JhY2xlLmNvbS0yMDEwMTIwMTA4NDMzMy1jNWlsa3Jld3FibGZvcGc3CisrKyBiL3N0 b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl LmNvbS0yMDEwMTIwMTEzMDkwMi1xMGc1NHVmaWkwNm9yNG9lCkBAIC02NTYsMjIgKzY1Niw0OSBA QCBpYnVmX3BhcnNlX2JpdG1hcF9pbml0KAogCXJldHVybihwdHIpOwogfQogI2lmbmRlZiBVTklW X0hPVEJBQ0tVUAorIyBpZmRlZiBVTklWX0RFQlVHCisvKiogR2V0cyB0aGUgZGVzaXJlZCBiaXRz IGZvciBhIGdpdmVuIHBhZ2UgZnJvbSBhIGJpdG1hcCBwYWdlLgorQHBhcmFtIHBhZ2UJaW46IGJp dG1hcCBwYWdlCitAcGFyYW0gb2Zmc2V0CWluOiBwYWdlIHdob3NlIGJpdHMgdG8gZ2V0CitAcGFy YW0genMJaW46IGNvbXByZXNzZWQgcGFnZSBzaXplIGluIGJ5dGVzOyAwIGZvciB1bmNvbXByZXNz ZWQgcGFnZXMKK0BwYXJhbSBiaXQJaW46IElCVUZfQklUTUFQX0ZSRUUsIElCVUZfQklUTUFQX0JV RkZFUkVELCAuLi4KK0BwYXJhbSBtdHIJaW46IG1pbmktdHJhbnNhY3Rpb24gaG9sZGluZyBhbiB4 LWxhdGNoIG9uIHRoZSBiaXRtYXAgcGFnZQorQHJldHVybgl2YWx1ZSBvZiBiaXRzICovCisjICBk ZWZpbmUgaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0cyhwYWdlLCBvZmZzZXQsIHpzLCBiaXQsIG10 cikJXAorCWlidWZfYml0bWFwX3BhZ2VfZ2V0X2JpdHNfbG93KHBhZ2UsIG9mZnNldCwgenMsCVwK KwkJCQkgICAgICBNVFJfTUVNT19QQUdFX1hfRklYLCBtdHIsIGJpdCkKKyMgZWxzZSAvKiBVTklW X0RFQlVHICovCisvKiogR2V0cyB0aGUgZGVzaXJlZCBiaXRzIGZvciBhIGdpdmVuIHBhZ2UgZnJv bSBhIGJpdG1hcCBwYWdlLgorQHBhcmFtIHBhZ2UJaW46IGJpdG1hcCBwYWdlCitAcGFyYW0gb2Zm c2V0CWluOiBwYWdlIHdob3NlIGJpdHMgdG8gZ2V0CitAcGFyYW0genMJaW46IGNvbXByZXNzZWQg cGFnZSBzaXplIGluIGJ5dGVzOyAwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMKK0BwYXJhbSBiaXQJ aW46IElCVUZfQklUTUFQX0ZSRUUsIElCVUZfQklUTUFQX0JVRkZFUkVELCAuLi4KK0BwYXJhbSBt dHIJaW46IG1pbmktdHJhbnNhY3Rpb24gaG9sZGluZyBhbiB4LWxhdGNoIG9uIHRoZSBiaXRtYXAg cGFnZQorQHJldHVybgl2YWx1ZSBvZiBiaXRzICovCisjICBkZWZpbmUgaWJ1Zl9iaXRtYXBfcGFn ZV9nZXRfYml0cyhwYWdlLCBvZmZzZXQsIHpzLCBiaXQsIG10cikJCVwKKwlpYnVmX2JpdG1hcF9w YWdlX2dldF9iaXRzX2xvdyhwYWdlLCBvZmZzZXQsIHpzLCBiaXQpCisjIGVuZGlmIC8qIFVOSVZf REVCVUcgKi8KKwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogR2V0cyB0aGUgZGVzaXJlZCBiaXRzIGZvciBh IGdpdmVuIHBhZ2UgZnJvbSBhIGJpdG1hcCBwYWdlLgogQHJldHVybgl2YWx1ZSBvZiBiaXRzICov CiBVTklWX0lOTElORQogdWxpbnQKLWlidWZfYml0bWFwX3BhZ2VfZ2V0X2JpdHMoCi0vKj09PT09 PT09PT09PT09PT09PT09PT0qLworaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3coCisvKj09 PT09PT09PT09PT09PT09PT09PT09PT09Ki8KIAljb25zdCBwYWdlX3QqCXBhZ2UsCS8qITwgaW46 IGJpdG1hcCBwYWdlICovCiAJdWxpbnQJCXBhZ2Vfbm8sLyohPCBpbjogcGFnZSB3aG9zZSBiaXRz IHRvIGdldCAqLwogCXVsaW50CQl6aXBfc2l6ZSwvKiE8IGluOiBjb21wcmVzc2VkIHBhZ2Ugc2l6 ZSBpbiBieXRlczsKIAkJCQkwIGZvciB1bmNvbXByZXNzZWQgcGFnZXMgKi8KLQl1bGludAkJYml0 LAkvKiE8IGluOiBJQlVGX0JJVE1BUF9GUkVFLAorI2lmZGVmIFVOSVZfREVCVUcKKwl1bGludAkJ bGF0Y2hfdHlwZSwKKwkJCQkvKiE8IGluOiBNVFJfTUVNT19QQUdFX1hfRklYLAorCQkJCU1UUl9N RU1PX0JVRl9GSVgsIC4uLiAqLworCW10cl90KgkJbXRyLAkvKiE8IGluOiBtaW5pLXRyYW5zYWN0 aW9uIGhvbGRpbmcgbGF0Y2hfdHlwZQorCQkJCW9uIHRoZSBiaXRtYXAgcGFnZSAqLworI2VuZGlm IC8qIFVOSVZfREVCVUcgKi8KKwl1bGludAkJYml0KQkvKiE8IGluOiBJQlVGX0JJVE1BUF9GUkVF LAogCQkJCUlCVUZfQklUTUFQX0JVRkZFUkVELCAuLi4gKi8KLQltdHJfdCoJCW10ciBfX2F0dHJp YnV0ZV9fKCh1bnVzZWQpKSkKLQkJCQkvKiE8IGluOiBtdHIgY29udGFpbmluZyBhbgotCQkJCXgt bGF0Y2ggdG8gdGhlIGJpdG1hcCBwYWdlICovCiB7CiAJdWxpbnQJYnl0ZV9vZmZzZXQ7CiAJdWxp bnQJYml0X29mZnNldDsKQEAgLTY4Myw3ICs3MTAsNyBAQCBpYnVmX2JpdG1hcF9wYWdlX2dldF9i aXRzKAogIyBlcnJvciAiSUJVRl9CSVRTX1BFUl9QQUdFICUgMiAhPSAwIgogI2VuZGlmCiAJdXRf YWQodXRfaXNfMnBvdyh6aXBfc2l6ZSkpOwotCXV0X2FkKG10cl9tZW1vX2NvbnRhaW5zX3BhZ2Uo bXRyLCBwYWdlLCBNVFJfTUVNT19QQUdFX1hfRklYKSk7CisJdXRfYWQobXRyX21lbW9fY29udGFp bnNfcGFnZShtdHIsIHBhZ2UsIGxhdGNoX3R5cGUpKTsKIAogCWlmICghemlwX3NpemUpIHsKIAkJ Yml0X29mZnNldCA9IChwYWdlX25vICUgVU5JVl9QQUdFX1NJWkUpICogSUJVRl9CSVRTX1BFUl9Q QUdFCkBAIC0xMTA5LDIxICsxMTM2LDI5IEBAIE11c3Qgbm90IGJlIGNhbGxlZCB3aGVuIHJlY3Zf bm9faWJ1Zl9vcGUKIEByZXR1cm4JVFJVRSBpZiBsZXZlbCAyIG9yIGxldmVsIDMgcGFnZSAqLwog VU5JVl9JTlRFUk4KIGlib29sCi1pYnVmX3BhZ2UoCi0vKj09PT09PSovCi0JdWxpbnQJc3BhY2Us CS8qITwgaW46IHNwYWNlIGlkICovCi0JdWxpbnQJemlwX3NpemUsLyohPCBpbjogY29tcHJlc3Nl ZCBwYWdlIHNpemUgaW4gYnl0ZXMsIG9yIDAgKi8KLQl1bGludAlwYWdlX25vLC8qITwgaW46IHBh Z2UgbnVtYmVyICovCi0JbXRyX3QqCW10cikJLyohPCBpbjogbXRyIHdoaWNoIHdpbGwgY29udGFp biBhbiB4LWxhdGNoIHRvIHRoZQotCQkJYml0bWFwIHBhZ2UgaWYgdGhlIHBhZ2UgaXMgbm90IG9u ZSBvZiB0aGUgZml4ZWQKLQkJCWFkZHJlc3MgaWJ1ZiBwYWdlcywgb3IgTlVMTCwgaW4gd2hpY2gg Y2FzZSBhIG5ldwotCQkJdHJhbnNhY3Rpb24gaXMgY3JlYXRlZC4gKi8KK2lidWZfcGFnZV9sb3co CisvKj09PT09PT09PT0qLworCXVsaW50CQlzcGFjZSwJLyohPCBpbjogc3BhY2UgaWQgKi8KKwl1 bGludAkJemlwX3NpemUsLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMsIG9y IDAgKi8KKwl1bGludAkJcGFnZV9ubywvKiE8IGluOiBwYWdlIG51bWJlciAqLworI2lmZGVmIFVO SVZfREVCVUcKKwlpYm9vbAkJeF9sYXRjaCwvKiE8IGluOiBGQUxTRSBpZiByZWxheGVkIGNoZWNr CisJCQkJKGF2b2lkIGxhdGNoaW5nIHRoZSBiaXRtYXAgcGFnZSkgKi8KKyNlbmRpZiAvKiBVTklW X0RFQlVHICovCisJY29uc3QgY2hhcioJZmlsZSwJLyohPCBpbjogZmlsZSBuYW1lICovCisJdWxp bnQJCWxpbmUsCS8qITwgaW46IGxpbmUgd2hlcmUgY2FsbGVkICovCisJbXRyX3QqCQltdHIpCS8q ITwgaW46IG10ciB3aGljaCB3aWxsIGNvbnRhaW4gYW4KKwkJCQl4LWxhdGNoIHRvIHRoZSBiaXRt YXAgcGFnZSBpZiB0aGUgcGFnZQorCQkJCWlzIG5vdCBvbmUgb2YgdGhlIGZpeGVkIGFkZHJlc3Mg aWJ1ZgorCQkJCXBhZ2VzLCBvciBOVUxMLCBpbiB3aGljaCBjYXNlIGEgbmV3CisJCQkJdHJhbnNh Y3Rpb24gaXMgY3JlYXRlZC4gKi8KIHsKIAlpYm9vbAlyZXQ7CiAJbXRyX3QJbG9jYWxfbXRyOwog CXBhZ2VfdCoJYml0bWFwX3BhZ2U7CiAKIAl1dF9hZCghcmVjdl9ub19pYnVmX29wZXJhdGlvbnMp OworCXV0X2FkKHhfbGF0Y2ggfHwgbXRyID09IE5VTEwpOwogCiAJaWYgKGlidWZfZml4ZWRfYWRk cl9wYWdlKHNwYWNlLCB6aXBfc2l6ZSwgcGFnZV9ubykpIHsKIApAQCAtMTEzNSwxMiArMTE3MCw1 NSBAQCBpYnVmX3BhZ2UoCiAKIAl1dF9hZChmaWxfc3BhY2VfZ2V0X3R5cGUoSUJVRl9TUEFDRV9J RCkgPT0gRklMX1RBQkxFU1BBQ0UpOwogCisjaWZkZWYgVU5JVl9ERUJVRworCWlmICgheF9sYXRj aCkgeworCQltdHJfc3RhcnQoJmxvY2FsX210cik7CisKKwkJLyogR2V0IHRoZSBiaXRtYXAgcGFn ZSB3aXRob3V0IGEgcGFnZSBsYXRjaCwgc28gdGhhdAorCQl3ZSB3aWxsIG5vdCBiZSB2aW9sYXRp bmcgdGhlIGxhdGNoaW5nIG9yZGVyIHdoZW4KKwkJYW5vdGhlciBiaXRtYXAgcGFnZSBoYXMgYWxy ZWFkeSBiZWVuIGxhdGNoZWQgYnkgdGhpcworCQl0aHJlYWQuIFRoZSBwYWdlIHdpbGwgYmUgYnVm ZmVyLWZpeGVkLCBhbmQgdGh1cyBpdAorCQljYW5ub3QgYmUgcmVtb3ZlZCBvciByZWxvY2F0ZWQg d2hpbGUgd2UgYXJlIGxvb2tpbmcgYXQKKwkJaXQuIFRoZSBjb250ZW50cyBvZiB0aGUgcGFnZSBj b3VsZCBjaGFuZ2UsIGJ1dCB0aGUKKwkJSUJVRl9CSVRNQVBfSUJVRiBiaXQgdGhhdCB3ZSBhcmUg aW50ZXJlc3RlZCBpbiBzaG91bGQKKwkJbm90IGJlIG1vZGlmaWVkIGJ5IGFueSBvdGhlciB0aHJl YWQuIE5vYm9keSBzaG91bGQgYmUKKwkJY2FsbGluZyBpYnVmX2FkZF9mcmVlX3BhZ2UoKSBvciBp YnVmX3JlbW92ZV9mcmVlX3BhZ2UoKQorCQl3aGlsZSB0aGUgcGFnZSBpcyBsaW5rZWQgdG8gdGhl IGluc2VydCBidWZmZXIgYi10cmVlLiAqLworCisJCWJpdG1hcF9wYWdlID0gYnVmX2Jsb2NrX2dl dF9mcmFtZSgKKwkJCWJ1Zl9wYWdlX2dldF9nZW4oCisJCQkJc3BhY2UsIHppcF9zaXplLAorCQkJ CWlidWZfYml0bWFwX3BhZ2Vfbm9fY2FsYyh6aXBfc2l6ZSwgcGFnZV9ubyksCisJCQkJUldfTk9f TEFUQ0gsIE5VTEwsIEJVRl9HRVRfTk9fTEFUQ0gsCisJCQkJZmlsZSwgbGluZSwgJmxvY2FsX210 cikpOworIyBpZmRlZiBVTklWX1NZTkNfREVCVUcKKwkJLyogVGhpcyBpcyBmb3IgdHJhY2tpbmcg QnVnICM1ODIxMi4gVGhpcyBjaGVjayBhbmQgbWVzc2FnZSBjYW4KKwkJYmUgcmVtb3ZlZCBvbmNl IGl0IGhhcyBiZWVuIGVzdGFibGlzaGVkIHRoYXQgb3VyIGFzc3VtcHRpb25zCisJCWFib3V0IHRo aXMgY29uZGl0aW9uIGFyZSBjb3JyZWN0LiBUaGUgYnVnIHdhcyBvbmx5IGEgb25lLXRpbWUKKwkJ b2NjdXJyZW5jZSwgdW5hYmxlIHRvIHJlcGVhdCBzaW5jZSB0aGVuLiAqLworCQl2b2lkKiBsYXRj aCA9IHN5bmNfdGhyZWFkX2xldmVsc19jb250YWlucyhTWU5DX0lCVUZfQklUTUFQKTsKKwkJaWYg KGxhdGNoKSB7CisJCQlmcHJpbnRmKHN0ZGVyciwgIkJ1ZyM1ODIxMiBVTklWX1NZTkNfREVCVUci CisJCQkJIiBsZXZlbHMgJXAgKCV1LCV1KVxuIiwKKwkJCQlsYXRjaCwgKHVuc2lnbmVkKSBzcGFj ZSwgKHVuc2lnbmVkKSBwYWdlX25vKTsKKwkJfQorIyBlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcg Ki8KKwkJcmV0ID0gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0c19sb3coCisJCQliaXRtYXBfcGFn ZSwgcGFnZV9ubywgemlwX3NpemUsCisJCQlNVFJfTUVNT19CVUZfRklYLCAmbG9jYWxfbXRyLCBJ QlVGX0JJVE1BUF9JQlVGKTsKKworCQltdHJfY29tbWl0KCZsb2NhbF9tdHIpOworCQlyZXR1cm4o cmV0KTsKKwl9CisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworCiAJaWYgKG10ciA9PSBOVUxMKSB7 CiAJCW10ciA9ICZsb2NhbF9tdHI7CiAJCW10cl9zdGFydChtdHIpOwogCX0KIAotCWJpdG1hcF9w YWdlID0gaWJ1Zl9iaXRtYXBfZ2V0X21hcF9wYWdlKHNwYWNlLCBwYWdlX25vLCB6aXBfc2l6ZSwg bXRyKTsKKwliaXRtYXBfcGFnZSA9IGlidWZfYml0bWFwX2dldF9tYXBfcGFnZV9mdW5jKHNwYWNl LCBwYWdlX25vLCB6aXBfc2l6ZSwKKwkJCQkJCSAgICBmaWxlLCBsaW5lLCBtdHIpOwogCiAJcmV0 ID0gaWJ1Zl9iaXRtYXBfcGFnZV9nZXRfYml0cyhiaXRtYXBfcGFnZSwgcGFnZV9ubywgemlwX3Np emUsCiAJCQkJCUlCVUZfQklUTUFQX0lCVUYsIG10cik7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2lidWYwaWJ1Zi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl L2luY2x1ZGUvaWJ1ZjBpYnVmLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEy MDEwODQzMzMtYzVpbGtyZXdxYmxmb3BnNworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv aWJ1ZjBpYnVmLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEyMDExMzA5MDIt cTBnNTR1ZmlpMDZvcjRvZQpAQCAtMjQ0LDE1ICsyNDQsNDQgQEAgTXVzdCBub3QgYmUgY2FsbGVk IHdoZW4gcmVjdl9ub19pYnVmX29wZQogQHJldHVybglUUlVFIGlmIGxldmVsIDIgb3IgbGV2ZWwg MyBwYWdlICovCiBVTklWX0lOVEVSTgogaWJvb2wKLWlidWZfcGFnZSgKLS8qPT09PT09Ki8KLQl1 bGludAlzcGFjZSwJLyohPCBpbjogc3BhY2UgaWQgKi8KLQl1bGludAl6aXBfc2l6ZSwvKiE8IGlu OiBjb21wcmVzc2VkIHBhZ2Ugc2l6ZSBpbiBieXRlcywgb3IgMCAqLwotCXVsaW50CXBhZ2Vfbm8s LyohPCBpbjogcGFnZSBudW1iZXIgKi8KLQltdHJfdCoJbXRyKTsJLyohPCBpbjogbXRyIHdoaWNo IHdpbGwgY29udGFpbiBhbiB4LWxhdGNoIHRvIHRoZQotCQkJYml0bWFwIHBhZ2UgaWYgdGhlIHBh Z2UgaXMgbm90IG9uZSBvZiB0aGUgZml4ZWQKLQkJCWFkZHJlc3MgaWJ1ZiBwYWdlcywgb3IgTlVM TCwgaW4gd2hpY2ggY2FzZSBhIG5ldwotCQkJdHJhbnNhY3Rpb24gaXMgY3JlYXRlZC4gKi8KK2li dWZfcGFnZV9sb3coCisvKj09PT09PT09PT0qLworCXVsaW50CQlzcGFjZSwJLyohPCBpbjogc3Bh Y2UgaWQgKi8KKwl1bGludAkJemlwX3NpemUsLyohPCBpbjogY29tcHJlc3NlZCBwYWdlIHNpemUg aW4gYnl0ZXMsIG9yIDAgKi8KKwl1bGludAkJcGFnZV9ubywvKiE8IGluOiBwYWdlIG51bWJlciAq LworI2lmZGVmIFVOSVZfREVCVUcKKwlpYm9vbAkJeF9sYXRjaCwvKiE8IGluOiBGQUxTRSBpZiBy ZWxheGVkIGNoZWNrCisJCQkJKGF2b2lkIGxhdGNoaW5nIHRoZSBiaXRtYXAgcGFnZSkgKi8KKyNl bmRpZiAvKiBVTklWX0RFQlVHICovCisJY29uc3QgY2hhcioJZmlsZSwJLyohPCBpbjogZmlsZSBu YW1lICovCisJdWxpbnQJCWxpbmUsCS8qITwgaW46IGxpbmUgd2hlcmUgY2FsbGVkICovCisJbXRy X3QqCQltdHIpCS8qITwgaW46IG10ciB3aGljaCB3aWxsIGNvbnRhaW4gYW4KKwkJCQl4LWxhdGNo IHRvIHRoZSBiaXRtYXAgcGFnZSBpZiB0aGUgcGFnZQorCQkJCWlzIG5vdCBvbmUgb2YgdGhlIGZp eGVkIGFkZHJlc3MgaWJ1ZgorCQkJCXBhZ2VzLCBvciBOVUxMLCBpbiB3aGljaCBjYXNlIGEgbmV3 CisJCQkJdHJhbnNhY3Rpb24gaXMgY3JlYXRlZC4gKi8KKwlfX2F0dHJpYnV0ZV9fKCh3YXJuX3Vu dXNlZF9yZXN1bHQpKTsKKyNpZmRlZiBVTklWX0RFQlVHCisvKiogQ2hlY2tzIGlmIGEgcGFnZSBp cyBhIGxldmVsIDIgb3IgMyBwYWdlIGluIHRoZSBpYnVmIGhpZXJhcmNoeSBvZgorcGFnZXMuICBN dXN0IG5vdCBiZSBjYWxsZWQgd2hlbiByZWN2X25vX2lidWZfb3BlcmF0aW9ucz09VFJVRS4KK0Bw YXJhbSBzcGFjZQl0YWJsZXNwYWNlIGlkZW50aWZpZXIKK0BwYXJhbSB6aXBfc2l6ZQljb21wcmVz c2VkIHBhZ2Ugc2l6ZSBpbiBieXRlcywgb3IgMAorQHBhcmFtIHBhZ2Vfbm8JcGFnZSBudW1iZXIK K0BwYXJhbSBtdHIJbWluaS10cmFuc2FjdGlvbiBvciBOVUxMCitAcmV0dXJuIFRSVUUgaWYgbGV2 ZWwgMiBvciBsZXZlbCAzIHBhZ2UgKi8KKyMgZGVmaW5lIGlidWZfcGFnZShzcGFjZSwgemlwX3Np emUsIHBhZ2Vfbm8sIG10cikJCQlcCisJaWJ1Zl9wYWdlX2xvdyhzcGFjZSwgemlwX3NpemUsIHBh Z2Vfbm8sIFRSVUUsIF9fRklMRV9fLCBfX0xJTkVfXywgbXRyKQorI2Vsc2UgLyogVVZJVl9ERUJV RyAqLworLyoqIENoZWNrcyBpZiBhIHBhZ2UgaXMgYSBsZXZlbCAyIG9yIDMgcGFnZSBpbiB0aGUg aWJ1ZiBoaWVyYXJjaHkgb2YKK3BhZ2VzLiAgTXVzdCBub3QgYmUgY2FsbGVkIHdoZW4gcmVjdl9u b19pYnVmX29wZXJhdGlvbnM9PVRSVUUuCitAcGFyYW0gc3BhY2UJdGFibGVzcGFjZSBpZGVudGlm aWVyCitAcGFyYW0gemlwX3NpemUJY29tcHJlc3NlZCBwYWdlIHNpemUgaW4gYnl0ZXMsIG9yIDAK K0BwYXJhbSBwYWdlX25vCXBhZ2UgbnVtYmVyCitAcGFyYW0gbXRyCW1pbmktdHJhbnNhY3Rpb24g b3IgTlVMTAorQHJldHVybiBUUlVFIGlmIGxldmVsIDIgb3IgbGV2ZWwgMyBwYWdlICovCisjIGRl ZmluZSBpYnVmX3BhZ2Uoc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLCBtdHIpCQkJXAorCWlidWZf cGFnZV9sb3coc3BhY2UsIHppcF9zaXplLCBwYWdlX25vLCBfX0ZJTEVfXywgX19MSU5FX18sIG10 cikKKyNlbmRpZiAvKiBVVklWX0RFQlVHICovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBGcmVlcyBl eGNlc3MgcGFnZXMgZnJvbSB0aGUgaWJ1ZiBmcmVlIGxpc3QuIFRoaXMgZnVuY3Rpb24gaXMgY2Fs bGVkIHdoZW4gYW4gT1MKIHRocmVhZCBjYWxscyBmc3Agc2VydmljZXMgdG8gYWxsb2NhdGUgYSBu ZXcgZmlsZSBzZWdtZW50LCBvciBhIG5ldyBwYWdlIHRvIGEKCg== --===============1148974729== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marko.makela@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@stripped # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 5880e2b15bbcf2095338c7f86609470090fad565 # timestamp: 2010-12-01 15:21:07 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # c5ilkrewqblfopg7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUGBsPEABpz/lHEwAQB7d/// f+ff5L////4EAAgAYA8cbD2+lFLe7V73k0eopPemGsnuWb26FDyooOnkpVAAeEoTVPRNMJplNM0i YmmaR+qaeU0DQA000NAAAEog0BGkaapP0p5qMmoGBANAaAA0A0GnqDmjRoaYQDTAmmgDIaGIA0Yj QwRkAEhQUEhpmRNGTJkDTTTQDQ0NGQAaaDQARKhJ5RhNGo2mptTaT1Mh6E9IaB6hoyAAA0AEiQQE wgEaCNU/RNPUZNJoMg0aeppptQNAyCoGBiTNcggDAkjNGKRkXG4MbIs5QIMYw95CVLZEMZByKjQ2 HCQwFIk7lTjOMoVCDRZM4hiuOiFxEAnBofM5aMAq/gc/nKkUef5XyT0kQfp4lfLzR62m6W0H+spY 3grgVQIcJgIKpwaeNdb4MasrNZB0z9J8MhfOV2a5wgfyqiDo7MZI4LHFzpaExiNwpGKRSBsjnlOS mSrXhQzCJOohmYtXkwzXSchBcsZMUSWtiMSaG8QrLNPEgX332mo2PjhYn+sbYObbinCM1RoHHcVc JgNAuUcldNKoTgbQbrbYkkkgGUzfQassvsTFuY8lYeyHS6XdVOrusaF6TZavhV1EGWivuznsqrPs 1Mexl8B0593ykxqRCb8T4rCfpcFqzsOopMLu0TF5qSlZKCTSDzlCh6NwtjdI6xi5Hce4040I1Wbq crDlcpCdz6bBXApVVVD+DBcea3HWUzKjGBIIdoV0rBmc9gRoSUDVTieonMuviarjcWVqjlIeMdZt NhjeOljeXTWwxv1cLVwsex7lBhfrBTeWcJhn96A7efMgD81RTv2ev+u5KV3UaezWNjgUPBTiKlZx FnNzIpyDZoEwIlEkcToscWDMUH3KIc5lcX1igd5qQcpFm7GzXE2Hxo9Q4xIUjIm9xgJR8UXNxMdm ojEQ1RS1jYc81iEcQwolLGRflQSuS0N10ePeWhqYHDM0EbhMcs3YlTRmFGkRPRqd9sSoQWkiUlba QvqKlnGK7TABjDVXc0Bxm1m39ri4iyE2DX3Y1c+TXxo2utQvGhtFNCm82xplyKuhkjHi3rtalTTO SysGnG8EvlGVw3LF896RMpFpxbtpdUj4HjzjU77UOI7yRlPrigfnB8HeKTuoP3aaTKaIQS7ETAj5 iLyxSl1Qrhsznue+nw5ONibpLt5h+9hmpwgvbMu9rN6TISoPQmZFB9lQsHToW7CsiVh0aikqOmhv gHXQ8SGbM5EJzfov5e6hVxiGuuPKhVsXZ9JIMblOt8dxKyyu0iqSDZZxVeC4006hXoD1wuiS2b/S ID3GCD2EeyCEmM7aWYrLDhouZU3mBGjNYjzNFaSUo2AQabEdxBBLYefBEoPY2EF7X1hFS/iGrF+z u4hHiVYNVOa0ZpP7EHV+AigtyVxUgs+nLSe3SywA0ZZSF2fiO/hee9lUhhOkkFqvhC31JGE9Pg45 tm3PbMILa1ZVbnQgD0x8dmOSOPINhgdKBRNv35SnEXjTQRpsNxtOfHU4YcJOB4EgswESq+ufaASQ tjdm1S66xZSUyLb4KxwMJqqgihYg2wLf8zGxv7UljUYymGGUPYp4A9VnCRCJqts7p6mPZcVJdpAV 285s4UMhUDBAmZa1tOi4VyGqpxa6vSSd+EXK7WRyCpxQS1sLjCB6GQj5PDYIyzI28dsthiBfIxnv fw6BmVfkEKUiGsWzJoH0JpyNEKmU0DpT0Pl6d779Ghmvq3H9c6nJSy5IHOalCBmLAfW5nwmg9AYW IhvlZcqpUj1OuyBM3EyKOLmqXigwRvsukTKmdqKkxnFdxWYyzO7TZLLKEHcgeUkaRTXBiSdznwUP HZhUs6ma560GOBIiVxu0QNGEGeRIZJU1OgggYqrcVM85XIUngloaHEft4zvE00I363wGrMr7sqOs 9yN0wthDtdQuFbc7kGALge9AfCHX+wGGPt5LgKRC3KVVVr5Fee0rlRt5nu4EMdzqUC3xS6cjyJ8w NBVqulIQhoA+gxgMr40Ieznfg+qKli4I5DkVGyRrgBLnOmql85g1i4WFwxHyrKi8JFNlWAlHta38 FLQnLKy2dwC4p+SLUmJtLYYiFxbiYQJI5I2e7LXb1yX4IxMRBeTA4mo1lNNKa2GqzFk0a0NUWh77 jYBRaLFGMiruZzFwSAzSkhGheCKShGK6I4I8pI3Adx9519Ym0DbofZUZVQydShijl+E1cG9d7DQM vjX0YMFAh/Z6tuVxbjgxG+z22K0bb28UF8AMOKgxtsYXx+36Qmhf8LjEkQWskCYhu6VlyohNXB+2 YY6yOmUpqMe8h5TPoIXim+r/bd52L6BfEO+a64W+muUQoHmvlgulAkBkBZEbBij592/YGKS4Io0Y nEi4QaDaGFlCbUme68zprVKuAkoPnsMhIkUUIPZVJf2xshu9egtU6vFjbIIkXIQxGWOolwB2s0yA 7d70lxkcYpOoMcxu8xBoMaWkzXGZQ4YqtIMsTSIJiNU018k6dWqpkiNxNZRthDfiQYmlj3YgojKm iMD2jiAoPv6LkDnH6E6EDi20BiWwLaAqsZlR5UDmgjq4iuGDYvtl6eAxMaVGiGFyTR4mqtuKuJDQ Fis4IDPPMmFBwMmNFS62Et8GgyoyDBsbUMMSOapBXTKtEHo7WHUMOqam1alkGKoMdEKEkRpXgS15 kCJ5emw/JRuZLux3Iqk0TOdnVM9aDIjVLxDDkraFIN+wpi8YtqLxnOZhSfr7vBIYApWAqbQopeSI DEJIUDEHceWRJUhQSTLQrgE1iJlLYU5Q5DtLSYcS4okeypRKyydsUdhVYPUyBmUiGlnYWFxLJSk6 KgROQNE4aUEpFe2qAuTWvd0Nt9s+XwmFFms+nR5scb7ELNNIUzf6Diaj5PUZs2QbiaqVQ6YjUMXP AzY9VZoAjSa8RJoJljAeSejSxtb20uVLAWOguR0e/74NySxVTz++fH56rjaWkLtHQpaFw4DIsXKQ tDrGdxfSH2jlbMffOwqVUuusQTeQ5BAMrQ6LA1BgZxBaWkfW5IkJTCZNFQGlyGr0qeB0MUHBJqCR AQMcCpsQQC6EGdLKVHD1TDWAFZgm2huS6uJCBpJeWhoE+7YcJPTJ2GhwJwUEw7LSJnsztJeXHaqu 2MkIprQR3KXkJNpIG0AqDFcQJSgepM9XqBhEDqAZ6ArMgSCeOSCSBIN6p8hK57F+qqhK0ZNStG5q ZKqaKHMSyRkImc/P6LTmYI+ZcRM+ZjkYjTbodvv5kygxqgy/yB6ZzPOvNclnMnPvVxZeapWIPWhk ImXFgjvGi0YO3xuJK34aloivFG6SEIQIRIQt4XtjvYg0nxloOcZtmzh7EU35mw4zERy+j1eOe/YB ubQ1HyoUjS8aYN9pjUW0+MontYuXVSSEifkcwxEi96eKOaBnNxzSX+eoU/N1gF6kSPEUkR5pBiKc BcDSW8xRf2PlOBNcWLCw+IuxRNek4jE2lmgGLIHI23pYyULEaq7hE77QO2EQ7Az5iU7CJIiEq5JB MjVsEBAVAKHhRE7ggYNI5h/M9QNR4da0DhiLBl8KycwclxO4yO6ktLrCAtuC0C+iReNWJxEdJNhd iXF7wkfWQZjAlqKzIxhWJioU/jL2JaUiQouU6TMRYm9a9cMViEFRKsQxpPNJMBAVk8jRrStQSdSJ aJLldcaSgKWWMcJNWkiBGAQiCENioGlJqvttPD4NTQO59BqoiiS8oxZ/HvRtaprWMzpbojIJbIaI ZewsBiSFQC514lKNbTKKSWzBWdB8QsENNNtfmEfcgOIp60V/lRZr6pbxFu2is9c9Z6YhqJfd3CUm AVQuwAtQt4wXPGCiTDrBINCGIoSGkdo0RBQNlpo7MQ9IePI4iyIt0PG0CXTCXpEc12BiGLGKGLFQ IMY1jhGqxiVB6rVEVERJpIqIL2HVNK0qEyv0SJKUdFl0OwxkdDDYSXUymCCPQbwMa9OzrCKculwe hXZX2YgG5chRtK6lllttsK1krEDXgebfuquFh2ULhto4zImaEYyhTqy5mlIMGY0axAhkzGgobSqE 5lpsXvoBjvtJV2pTOxm5ab1YWqJC2FCQmJenNGmynFhYciOrztGBRajBPcPIvJmVkV0FGnsljcIw KjwIG8LkdReVGSJ1JxWUOc6tca7E5DC6ObtuVEKif7BamMwZUEnOsSU6rfEeAsxbJwCDMaxeOUX0 wztOWpW/VKvZMmhKt4Fwrl4CSlNcRrbTFBaEbSAWMkRhNGYeJ49e9Hl6EAExHugGM7+SOYiOOYM4 SZqgfaZ0t3ot6vGJ/vHsHsUVIOEw4AcS1b85pVLHBYJZ+aqq0QwhiKJnbfC6Fn57CcmULx2pRhl1 QcI2mkUn2v1eF3LkFgrp0IgeZQqExqFZWwH5FIH+LLv+LuSKcKEggwNh4g== --===============1148974729==--