From: marko.makela Date: September 9 2010 11:27am Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3177) List-Archive: http://lists.mysql.com/commits/117841 Message-Id: <201009091128.o899qEEm027886@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0975689535==" --===============0975689535== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDkwOTEwNTAwNi1memlo Z2tkN2dqeDdhYzlzCgogMzE3NyBNYXJrbyBNw6RrZWzDpAkyMDEwLTA5LTA5CiAgICAgIFJlbW92 ZSB1dDBhdXhjb25mLmguCiAgICAgIEl0IHdhcyBuZWVkZWQgd2hlbiBJbm5vREIgUGx1Z2luIHdh cyBkaXN0cmlidXRlZCBpbmRlcGVuZGVudGx5IG9mIE15U1FMLgogICAgICBBcHByb3ZlZCBieSBW YXNpbCBEaW1vdi4KCiAgICByZW1vdmVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv dXQwYXV4Y29uZi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9hdG9taWNf cHRocmVhZF90X2djYy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9hdG9t aWNfcHRocmVhZF90X3NvbGFyaXMuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNv bmZfaGF2ZV9nY2NfYXRvbWljcy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29u Zl9oYXZlX3NvbGFyaXNfYXRvbWljcy5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4 Y29uZl9wYXVzZS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9zaXplb2Zf cHRocmVhZF90LmMKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL0RveHlmaWxl CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvTWFrZWZpbGUuYW0KICAgICAgc3RvcmFnZS9pbm5vYmFz ZS9pbmNsdWRlL3VuaXYuaQo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9Eb3h5 ZmlsZScKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9Eb3h5ZmlsZQlyZXZpZDptYXJrby5tYWtlbGFA b3JhY2xlLmNvbS0yMDEwMDkwOTEwNTAwNi1memloZ2tkN2dqeDdhYzlzCisrKyBiL3N0b3JhZ2Uv aW5ub2Jhc2UvRG94eWZpbGUJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5MDkx MTI3NTItYWM1dzd6eXpidjEwbnZpMQpAQCAtNTY1LDcgKzU2NSw3IEBAIFJFQ1VSU0lWRSAgICAg ICAgICAgICAgPSBZRVMKICMgZXhjbHVkZWQgZnJvbSB0aGUgSU5QVVQgc291cmNlIGZpbGVzLiBU aGlzIHdheSB5b3UgY2FuIGVhc2lseSBleGNsdWRlIGEKICMgc3ViZGlyZWN0b3J5IGZyb20gYSBk aXJlY3RvcnkgdHJlZSB3aG9zZSByb290IGlzIHNwZWNpZmllZCB3aXRoIHRoZSBJTlBVVCB0YWcu CiAKLUVYQ0xVREUgICAgICAgICAgICAgICAgPSB1dDBhdXhjb25mXyoKK0VYQ0xVREUgICAgICAg ICAgICAgICAgPQogCiAjIFRoZSBFWENMVURFX1NZTUxJTktTIHRhZyBjYW4gYmUgdXNlZCBzZWxl Y3Qgd2hldGhlciBvciBub3QgZmlsZXMgb3IKICMgZGlyZWN0b3JpZXMgdGhhdCBhcmUgc3ltYm9s aWMgbGlua3MgKGEgVW5peCBmaWxlc3lzdGVtIGZlYXR1cmUpIGFyZSBleGNsdWRlZAoKPT09IG1v ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvTWFrZWZpbGUuYW0nCi0tLSBhL3N0b3JhZ2Uv aW5ub2Jhc2UvTWFrZWZpbGUuYW0JcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5 MDkxMDUwMDYtZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdlL2lubm9iYXNlL01ha2VmaWxl LmFtCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwOTA5MTEyNzUyLWFjNXc3enl6 YnYxMG52aTEKQEAgLTIwNyw3ICsyMDcsNiBAQCBub2luc3RfSEVBREVSUz0JCVwKIAkJCWluY2x1 ZGUvdXNyMHNlc3MuaAlcCiAJCQlpbmNsdWRlL3VzcjBzZXNzLmljCVwKIAkJCWluY2x1ZGUvdXNy MHR5cGVzLmgJXAotCQkJaW5jbHVkZS91dDBhdXhjb25mLmgJXAogCQkJaW5jbHVkZS91dDBieXRl LmgJXAogCQkJaW5jbHVkZS91dDBieXRlLmljCVwKIAkJCWluY2x1ZGUvdXQwZGJnLmgJXAoKPT09 IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmknCi0tLSBhL3N0 b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j b20tMjAxMDA5MDkxMDUwMDYtZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdlL2lubm9iYXNl L2luY2x1ZGUvdW5pdi5pCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwOTA5MTEy NzUyLWFjNXc3enl6YnYxMG52aTEKQEAgLTc4LDE5ICs3OCw2IEBAIHRoZSB2aXJ0dWFsIG1ldGhv ZCB0YWJsZSAodnRhYmxlKSBpbiBHQ0MKICMgZGVmaW5lIGhhX2lubm9iYXNlIGhhX2lubm9kYgog I2VuZGlmIC8qIE1ZU1FMX0RZTkFNSUNfUExVR0lOICovCiAKLS8qIGlmIGFueSBvZiB0aGUgZm9s bG93aW5nIG1hY3JvcyBpcyBkZWZpbmVkIGF0IHRoaXMgcG9pbnQgdGhpcyBtZWFucwotdGhhdCB0 aGUgY29kZSBmcm9tIHRoZSAicmlnaHQiIHBsdWcuaW4gd2FzIGV4ZWN1dGVkIGFuZCB3ZSBkbyBu b3QKLW5lZWQgdG8gaW5jbHVkZSB1dDBhdXhjb25mLmggd2hpY2ggd291bGQgZWl0aGVyIGRlZmlu ZSB0aGUgc2FtZSBtYWNyb3MKLW9yIHdpbGwgYmUgZW1wdHkgKi8KLSNpZiAhZGVmaW5lZChIQVZF X0lCX0dDQ19BVE9NSUNfQlVJTFRJTlMpIFwKLSAmJiAhZGVmaW5lZChIQVZFX0lCX0FUT01JQ19Q VEhSRUFEX1RfR0NDKSBcCi0gJiYgIWRlZmluZWQoSEFWRV9JQl9TT0xBUklTX0FUT01JQ1MpIFwK LSAmJiAhZGVmaW5lZChIQVZFX0lCX0FUT01JQ19QVEhSRUFEX1RfU09MQVJJUykgXAotICYmICFk ZWZpbmVkKFNJWkVPRl9QVEhSRUFEX1QpIFwKLSAmJiAhZGVmaW5lZChIQVZFX0lCX1BBVVNFX0lO U1RSVUNUSU9OKQotIyBpbmNsdWRlICJ1dDBhdXhjb25mLmgiCi0jZW5kaWYKLQogI2lmIChkZWZp bmVkKFdJTjMyKSB8fCBkZWZpbmVkKF9XSU4zMikgfHwgZGVmaW5lZChXSU42NCkgfHwgZGVmaW5l ZChfV0lONjQpKSAmJiAhZGVmaW5lZChNWVNRTF9TRVJWRVIpICYmICFkZWZpbmVkKF9fV0lOX18p CiAjIHVuZGVmIF9fV0lOX18KICMgZGVmaW5lIF9fV0lOX18KCj09PSByZW1vdmVkIGZpbGUgJ3N0 b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91dDBhdXhjb25mLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh c2UvaW5jbHVkZS91dDBhdXhjb25mLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx MDA5MDkxMDUwMDYtZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1 ZGUvdXQwYXV4Y29uZi5oCTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKQEAgLTEsMTQgKzAsMCBA QAotLyogRG8gbm90IHJlbW92ZSB0aGlzIGZpbGUgZXZlbiB0aG91Z2ggaXQgaXMgZW1wdHkuCi1U aGlzIGZpbGUgaXMgaW5jbHVkZWQgaW4gdW5pdi5pIGFuZCB3aWxsIGNhdXNlIGNvbXBpbGF0aW9u IGZhaWx1cmUKLWlmIG5vdCBwcmVzZW50LgotQSBjdXN0b20gY2hlY2tzIGhhdmUgYmVlbiBhZGRl ZCBpbiB0aGUgZ2VuZXJhdGVkCi1zdG9yYWdlL2lubm9iYXNlL01ha2VmaWxlLmluIHRoYXQgaXMg c2hpcHBlZCB3aXRoIHRoZSBJbm5vREIgUGx1Z2luCi1zb3VyY2UgYXJjaGl2ZS4gVGhlc2UgY2hl Y2tzIGV2ZW50dWFsbHkgZGVmaW5lIHNvbWUgbWFjcm9zIGFuZCBwdXQKLXRoZW0gaW4gdGhpcyBm aWxlLgotVGhpcyBpcyBhIGhhY2sgdGhhdCBoYXMgYmVlbiBkZXZlbG9wZWQgaW4gb3JkZXIgdG8g ZGVwbG95IG5ldyBjb21waWxlCi10aW1lIGNoZWNrcyB3aXRob3V0IHRoZSBuZWVkIHRvIHJlZ2Vu ZXJhdGUgdGhlIC4vY29uZmlndXJlIHNjcmlwdCB0aGF0IGlzCi1kaXN0cmlidXRlZCBpbiB0aGUg TXlTUUwgNS4xIG9mZmljaWFsIHNvdXJjZSBhcmNoaXZlcy4KLUlmIGJ5IGFueSBjaGFuY2UgTWFr ZWZpbGUuaW4gYW5kIC4vY29uZmlndXJlIGFyZSByZWdlbmVyYXRlZCBhbmQgdGh1cwotdGhlIGhh Y2sgZnJvbSBNYWtlZmlsZS5pbiB3aXBlZCBhd2F5IHRoZW4gdGhlICJyZWFsIiBjaGVja3MgZnJv bSBwbHVnLmluCi13aWxsIHRha2Ugb3Zlci4KLSovCgo9PT0gcmVtb3ZlZCBmaWxlICdzdG9yYWdl L2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfYXRvbWljX3B0aHJlYWRfdF9nY2MuYycKLS0tIGEvc3Rv cmFnZS9pbm5vYmFzZS91dC91dDBhdXhjb25mX2F0b21pY19wdGhyZWFkX3RfZ2NjLmMJcmV2aWQ6 bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5MDkxMDUwMDYtZnppaGdrZDdnang3YWM5cwor KysgYi9zdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfYXRvbWljX3B0aHJlYWRfdF9nY2Mu YwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCkBAIC0xLDQzICswLDAgQEAKLS8qKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKgotCi1Db3B5cmlnaHQgKGMpIDIwMDksIElubm9iYXNlIE95LiBBbGwgUmlnaHRz IFJlc2VydmVkLgotCi1UaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp c3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgotdGhlIHRlcm1zIG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUK LUZvdW5kYXRpb247IHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZS4KLQotVGhpcyBwcm9ncmFtIGlz IGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dCBXSVRI T1VUCi1BTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZiBN RVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUwotRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiBTZWUg dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0KLVlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGFsb25nIHdpdGgKLXRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUKLVBsYWNlLCBTdWl0ZSAzMzAsIEJv c3RvbiwgTUEgMDIxMTEtMTMwNyBVU0EKLQotKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0KLS8qKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKgotSWYgdGhpcyBwcm9ncmFtIGNvbXBpbGVzLCB0aGVuIHB0aHJlYWRf dCBvYmplY3RzIGNhbiBiZSB1c2VkIGFzIGFyZ3VtZW50cwotdG8gR0NDIGF0b21pYyBidWlsdGlu IGZ1bmN0aW9ucy4KLQotQ3JlYXRlZCBNYXJjaCA1LCAyMDA5IFZhc2lsIERpbW92Ci0qKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKi8KLQotI2luY2x1ZGUgPHB0aHJlYWQuaD4KLSNpbmNsdWRlIDxzdHJpbmcu aD4KLQotaW50Ci1tYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKLXsKLQlwdGhyZWFkX3QJeDE7 Ci0JcHRocmVhZF90CXgyOwotCXB0aHJlYWRfdAl4MzsKLQotCW1lbXNldCgmeDEsIDB4MCwgc2l6 ZW9mKHgxKSk7Ci0JbWVtc2V0KCZ4MiwgMHgwLCBzaXplb2YoeDIpKTsKLQltZW1zZXQoJngzLCAw eDAsIHNpemVvZih4MykpOwotCi0JX19zeW5jX2Jvb2xfY29tcGFyZV9hbmRfc3dhcCgmeDEsIHgy LCB4Myk7Ci0KLQlyZXR1cm4oMCk7Ci19Cgo9PT0gcmVtb3ZlZCBmaWxlICdzdG9yYWdlL2lubm9i YXNlL3V0L3V0MGF1eGNvbmZfYXRvbWljX3B0aHJlYWRfdF9zb2xhcmlzLmMnCi0tLSBhL3N0b3Jh Z2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9hdG9taWNfcHRocmVhZF90X3NvbGFyaXMuYwlyZXZp ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDkwOTEwNTAwNi1memloZ2tkN2dqeDdhYzlz CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9hdG9taWNfcHRocmVhZF90X3Nv bGFyaXMuYwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCkBAIC0xLDU0ICswLDAgQEAKLS8qKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKgotCi1Db3B5cmlnaHQgKGMpIDIwMDksIElubm9iYXNlIE95LiBBbGwg UmlnaHRzIFJlc2VydmVkLgotCi1UaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNh biByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgotdGhlIHRlcm1zIG9mIHRo ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29m dHdhcmUKLUZvdW5kYXRpb247IHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZS4KLQotVGhpcyBwcm9n cmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1 dCBXSVRIT1VUCi1BTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50 eSBvZiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUwotRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF LiBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0K LVlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlIGFsb25nIHdpdGgKLXRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3cml0ZSB0byB0aGUg RnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUKLVBsYWNlLCBTdWl0ZSAz MzAsIEJvc3RvbiwgTUEgMDIxMTEtMTMwNyBVU0EKLQotKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0K LS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKgotSWYgdGhpcyBwcm9ncmFtIGNvbXBpbGVzIGFuZCByZXR1 cm5zIDAsIHRoZW4gcHRocmVhZF90IG9iamVjdHMgY2FuIGJlIHVzZWQgYXMKLWFyZ3VtZW50cyB0 byBTb2xhcmlzIGxpYmMgYXRvbWljIGZ1bmN0aW9ucy4KLQotQ3JlYXRlZCBBcHJpbCAxOCwgMjAw OSBWYXNpbCBEaW1vdgotKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCi0KLSNpbmNsdWRlIDxwdGhyZWFk Lmg+Ci0jaW5jbHVkZSA8c3RyaW5nLmg+Ci0KLWludAotbWFpbihpbnQgYXJnYywgY2hhcioqIGFy Z3YpCi17Ci0JcHRocmVhZF90CXgxOwotCXB0aHJlYWRfdAl4MjsKLQlwdGhyZWFkX3QJeDM7Ci0K LQltZW1zZXQoJngxLCAweDAsIHNpemVvZih4MSkpOwotCW1lbXNldCgmeDIsIDB4MCwgc2l6ZW9m KHgyKSk7Ci0JbWVtc2V0KCZ4MywgMHgwLCBzaXplb2YoeDMpKTsKLQotCWlmIChzaXplb2YocHRo cmVhZF90KSA9PSA0KSB7Ci0KLQkJYXRvbWljX2Nhc18zMigmeDEsIHgyLCB4Myk7Ci0KLQl9IGVs c2UgaWYgKHNpemVvZihwdGhyZWFkX3QpID09IDgpIHsKLQotCQlhdG9taWNfY2FzXzY0KCZ4MSwg eDIsIHgzKTsKLQotCX0gZWxzZSB7Ci0KLQkJcmV0dXJuKDEpOwotCX0KLQotCXJldHVybigwKTsK LX0KCj09PSByZW1vdmVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9oYXZl X2djY19hdG9taWNzLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwYXV4Y29uZl9oYXZl X2djY19hdG9taWNzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5MDkxMDUw MDYtZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNvbmZf aGF2ZV9nY2NfYXRvbWljcy5jCTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKQEAgLTEsNjEgKzAs MCBAQAotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqCi0KLUNvcHlyaWdodCAoYykgMjAwOSwgSW5ub2Jh c2UgT3kuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCi0KLVRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3 YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0IHVuZGVyCi10aGUg dGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0 aGUgRnJlZSBTb2Z0d2FyZQotRm91bmRhdGlvbjsgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLgot Ci1UaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJl IHVzZWZ1bCwgYnV0IFdJVEhPVVQKLUFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBs aWVkIHdhcnJhbnR5IG9mIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTCi1GT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuIFNlZSB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KLQotWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdl bmVyYWwgUHVibGljIExpY2Vuc2UgYWxvbmcgd2l0aAotdGhpcyBwcm9ncmFtOyBpZiBub3QsIHdy aXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDU5IFRlbXBsZQotUGxh Y2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBNQSAwMjExMS0xMzA3IFVTQQotCi0qKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKi8KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCi1JZiB0aGlzIHByb2dyYW0gY29tcGls ZXMgYW5kIHJldHVybnMgMCwgdGhlbiBHQ0MgYXRvbWljIGZ1bmNpb25zIGFyZSBhdmFpbGFibGUu Ci0KLUNyZWF0ZWQgU2VwdGVtYmVyIDEyLCAyMDA5IFZhc2lsIERpbW92Ci0qKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKi8KLQotaW50Ci1tYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKLXsKLQlsb25nCXg7 Ci0JbG9uZwl5OwotCWxvbmcJcmVzOwotCWNoYXIJYzsKLQotCXggPSAxMDsKLQl5ID0gMTIzOwot CXJlcyA9IF9fc3luY19ib29sX2NvbXBhcmVfYW5kX3N3YXAoJngsIHgsIHkpOwotCWlmICghcmVz IHx8IHggIT0geSkgewotCQlyZXR1cm4oMSk7Ci0JfQotCi0JeCA9IDEwOwotCXkgPSAxMjM7Ci0J cmVzID0gX19zeW5jX2Jvb2xfY29tcGFyZV9hbmRfc3dhcCgmeCwgeCArIDEsIHkpOwotCWlmIChy ZXMgfHwgeCAhPSAxMCkgewotCQlyZXR1cm4oMSk7Ci0JfQotCi0JeCA9IDEwOwotCXkgPSAxMjM7 Ci0JcmVzID0gX19zeW5jX2FkZF9hbmRfZmV0Y2goJngsIHkpOwotCWlmIChyZXMgIT0gMTIzICsg MTAgfHwgeCAhPSAxMjMgKyAxMCkgewotCQlyZXR1cm4oMSk7Ci0JfQotCi0JYyA9IDEwOwotCXJl cyA9IF9fc3luY19sb2NrX3Rlc3RfYW5kX3NldCgmYywgMTIzKTsKLQlpZiAocmVzICE9IDEwIHx8 IGMgIT0gMTIzKSB7Ci0JCXJldHVybigxKTsKLQl9Ci0KLQlyZXR1cm4oMCk7Ci19Cgo9PT0gcmVt b3ZlZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfaGF2ZV9zb2xhcmlzX2F0 b21pY3MuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS91dC91dDBhdXhjb25mX2hhdmVfc29sYXJp c19hdG9taWNzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA5MDkxMDUwMDYt ZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfaGF2 ZV9zb2xhcmlzX2F0b21pY3MuYwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCkBAIC0xLDM5ICsw LDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKgotCi1Db3B5cmlnaHQgKGMpIDIwMDksIElubm9i YXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgotCi1UaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRlcgotdGhl IHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkg dGhlIEZyZWUgU29mdHdhcmUKLUZvdW5kYXRpb247IHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZS4K LQotVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBi ZSB1c2VmdWwsIGJ1dCBXSVRIT1VUCi1BTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1w bGllZCB3YXJyYW50eSBvZiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUwotRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFLiBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3Jl IGRldGFpbHMuCi0KLVlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFsb25nIHdpdGgKLXRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3 cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUKLVBs YWNlLCBTdWl0ZSAzMzAsIEJvc3RvbiwgTUEgMDIxMTEtMTMwNyBVU0EKLQotKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovCi0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotSWYgdGhpcyBwcm9ncmFtIGNvbXBp bGVzLCB0aGVuIFNvbGFyaXMgbGliYyBhdG9taWMgZnVuY2lvbnMgYXJlIGF2YWlsYWJsZS4KLQot Q3JlYXRlZCBBcHJpbCAxOCwgMjAwOSBWYXNpbCBEaW1vdgotKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov Ci0jaW5jbHVkZSA8YXRvbWljLmg+Ci0KLWludAotbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3Yp Ci17Ci0JdWxvbmdfdAkJdWxvbmcJPSAwOwotCXVpbnQzMl90CXVpbnQzMgk9IDA7Ci0JdWludDY0 X3QJdWludDY0CT0gMDsKLQotCWF0b21pY19jYXNfdWxvbmcoJnVsb25nLCAwLCAxKTsKLQlhdG9t aWNfY2FzXzMyKCZ1aW50MzIsIDAsIDEpOwotCWF0b21pY19jYXNfNjQoJnVpbnQ2NCwgMCwgMSk7 Ci0JYXRvbWljX2FkZF9sb25nKCZ1bG9uZywgMCk7Ci0KLQlyZXR1cm4oMCk7Ci19Cgo9PT0gcmVt b3ZlZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfcGF1c2UuYycKLS0tIGEv c3RvcmFnZS9pbm5vYmFzZS91dC91dDBhdXhjb25mX3BhdXNlLmMJcmV2aWQ6bWFya28ubWFrZWxh QG9yYWNsZS5jb20tMjAxMDA5MDkxMDUwMDYtZnppaGdrZDdnang3YWM5cworKysgYi9zdG9yYWdl L2lubm9iYXNlL3V0L3V0MGF1eGNvbmZfcGF1c2UuYwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAw CkBAIC0xLDMyICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotCi1Db3B5cmlnaHQgKGMp IDIwMDksIElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgotCi1UaGlzIHByb2dyYW0g aXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBp dCB1bmRlcgotdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBw dWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKLUZvdW5kYXRpb247IHZlcnNpb24gMiBvZiB0 aGUgTGljZW5zZS4KLQotVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRo YXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dCBXSVRIT1VUCi1BTlkgV0FSUkFOVFk7IHdpdGhvdXQg ZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUwot Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGZvciBtb3JlIGRldGFpbHMuCi0KLVlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkg b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFsb25nIHdpdGgKLXRoaXMgcHJvZ3Jh bTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1 OSBUZW1wbGUKLVBsYWNlLCBTdWl0ZSAzMzAsIEJvc3RvbiwgTUEgMDIxMTEtMTMwNyBVU0EKLQot KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKiovCi0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotSWYgdGhpcyBw cm9ncmFtIGNvbXBpbGVzIGFuZCBjYW4gYmUgcnVuIGFuZCByZXR1cm5zIDAsIHRoZW4gdGhlIHBh dXNlCi1pbnN0cnVjdGlvbiBpcyBhdmFpbGFibGUuCi0KLUNyZWF0ZWQgSnVsIDIxLCAyMDA5IFZh c2lsIERpbW92Ci0qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KLQotaW50Ci1tYWluKGludCBhcmdjLCBj aGFyKiogYXJndikKLXsKLQlfX2FzbV9fIF9fdm9sYXRpbGVfXyAoInBhdXNlIik7Ci0KLQlyZXR1 cm4oMCk7Ci19Cgo9PT0gcmVtb3ZlZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNv bmZfc2l6ZW9mX3B0aHJlYWRfdC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3V0L3V0MGF1eGNv bmZfc2l6ZW9mX3B0aHJlYWRfdC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw OTA5MTA1MDA2LWZ6aWhna2Q3Z2p4N2FjOXMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS91dC91dDBh dXhjb25mX3NpemVvZl9wdGhyZWFkX3QuYwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCkBAIC0x LDM1ICswLDAgQEAKLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotCi1Db3B5cmlnaHQgKGMpIDIwMDks IElubm9iYXNlIE95LiBBbGwgUmlnaHRzIFJlc2VydmVkLgotCi1UaGlzIHByb2dyYW0gaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdCB1bmRl cgotdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNo ZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUKLUZvdW5kYXRpb247IHZlcnNpb24gMiBvZiB0aGUgTGlj ZW5zZS4KLQotVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQg d2lsbCBiZSB1c2VmdWwsIGJ1dCBXSVRIT1VUCi1BTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0 aGUgaW1wbGllZCB3YXJyYW50eSBvZiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUwotRk9SIEEg UEFSVElDVUxBUiBQVVJQT1NFLiBTZWUgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCi0KLVlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFsb25nIHdpdGgKLXRoaXMgcHJvZ3JhbTsgaWYg bm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1w bGUKLVBsYWNlLCBTdWl0ZSAzMzAsIEJvc3RvbiwgTUEgMDIxMTEtMTMwNyBVU0EKLQotKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKiovCi0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgotVGhpcyBwcm9ncmFtIHNo b3VsZCBjb21waWxlIGFuZCB3aGVuIHJ1biwgcHJpbnQgYSBzaW5nbGUgbGluZSBsaWtlOgotI2Rl ZmluZSBTSVpFT0ZfUFRIUkVBRF9UICVkCi0KLUNyZWF0ZWQgQXByaWwgMTgsIDIwMDkgVmFzaWwg RGltb3YKLSoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqLwotCi0jaW5jbHVkZSA8c3RkaW8uaD4KLSNpbmNs dWRlIDxwdGhyZWFkLmg+Ci0KLWludAotbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCi17Ci0J cHJpbnRmKCIjZGVmaW5lIFNJWkVPRl9QVEhSRUFEX1QgJWRcbiIsIChpbnQpIHNpemVvZihwdGhy ZWFkX3QpKTsKLQotCXJldHVybigwKTsKLX0KCg== --===============0975689535== 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: 06a5cccc202e8b6e666659d1ada2e7edbe9a1472 # timestamp: 2010-09-09 14:28:02 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@stripped\ # fzihgkd7gjx7ac9s # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUB7wZ8AAtPflEAUUmP/938m e0C//9/wBAAIAFAFPluO01mzXKzbWubatwkpqaamaiep6Tap+TVP0ANJMh6j1PSGRk8oaBJUyZAG jKp+Cp6n5KAHqAAAAPUCSTQmmknqeU9Gk0ninkg0AaNDIANA5hMAmAEwmE0wAACZNNAwkkJkRptT BTyap6R6nqGTIM1ANDQNCZeW55sd305fHEp0k/Jsa3UYOITCDLMzcJ9I9+j9IwdiHHVkuS1JmZmG YO65d8I2GyiCzrcsJQeTocqWg71/OL7+3f/fHnnXo95WpZOciFCNeDr0ZoasozZRqmTZYaxE8wj6 kiSJFJxfml1MSABWlf2UuRuIqSwas87Px0S7H1yrzLnarJLcfzSy3iXKs1Zy0WN0gJs7I2snZlyJ mGEoyEHFJ7DiQiUmGCpJOlm5FSaLEhoEZjoWaFvyKUZDK017HLr6v6UmEWm0sGCA8HsrOEhB7JbV wlw0J/ghoIkIryjKtKOSoiIhB+VecmaDiTooYXTYKkb+8GGhX60tzWPSWA/ofhZgRjNrUyW4cb6c yhoiMdW8QQIq+Sqe6HNQ8RoTIcTCjW0itK54u3EZuxCeTLDfdsHbCJq2nTphbFiCt0b3HK6EoGm6 XVVKbFTTunSiMmdMsidA+oqBybEqHlw0WJhMZr6M0omG2klPfg5SIZT7WRmq1fx2BG81ZyJyjUra maq+6CVuRUFhWOgXJMLpdXNEaUbHpKQkaGeN0KnWJNJzRp100RkYYFUnGIXXN0zNeLNCaW0zEWxS eJEktixL70ZLEkXESuK3teIjdGZdTBLYWMGpKFJnVQMRycUDzSRGGsvvrjNr6B09dTUjc1yTkhQI abHpXDioNpW62454DBxCJHpK5yowsgK98htLaHTPsDJoSchotQFQpUtUiB7Qw5ea21VjOB3Unp+7 gsLjajtNIlho+0pGQc5wOPn0v55PIpjPPFIg3p+Jia+C5tx5PpxY3GVhhcOUgtowGMl2GdLTuNdx eJbTwhE1dYjpUOrtAJwLTrKSBhEXeukS9/JbluiuWM0FVQlNxOnwHrDm4cXGdKRxZaUSnEzYCCVZ 6mAwb1ZoEd/zJF6XF5VBpOTziN0uY05pUOXS72pOIJVD8JZxmJ2TADFyQFfGQWEJdzEvNC61D0fF Na9iVfIeN50rlZItzS4heaV6vQHBjOxhwkajwhjjztlc+MKSWqJNaaFrWGtxvc1KpFo7tYY8k9U/ dbdGx2PQnwo702P2YPSX8x5+QIRTEMNI4voOepSJ6TOdSUeRxEqGkLbEsMAtcdQQOHNOLFetqoix ebFOlf1qtTT4NuAq9Ty1UWAxvzGQW6DrlXbPwSdHQOdWrNJPPrKWbuS2CkydjzF0z2whQKoWLXUn rt7ylXSocy0oD884uhJbltC4V0BA6C0AYVMOE5Lv8FLFkAcG4CWa+p1gyhsxVE+BrtgrpSB3aODI 3Klikgi0KBxvkB4PW4JAOZDLoEcfKkm7IhsrYl1WCBhbmedADKKK97LsqCG9Ns76LHJyHhVNGvvm /NNTEjrToJcah69FMPHRJVTP2kdBOckdUFYPHm9rlQtLiKwK4TKZHumICl2l0nAn2araHtIvAWDP frF57MvDyFaiZM0EdkXRjqmaahxf2Gq1D3372nWniHExvg01FhGYrv6X+MRWrOyhcsqkq1OWLHy2 VZ0EZEdxGYbK6Aj/F1v/F3JFOFCQQHvBnw== --===============0975689535==--