From: marko.makela Date: April 21 2011 9:24am Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3603) List-Archive: http://lists.mysql.com/commits/135896 Message-Id: <201104210925.p3L9P5Ao032160@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0845196306==" --===============0845196306== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNDIxMDgxMTAwLXE4MDhm Zmc2d3E3cTNkMTIKCiAzNjAzIE1hcmtvIE3DpGtlbMOkCTIwMTEtMDQtMjEKICAgICAgRml4IHRo ZSBVTklWX0hPVEJBQ0tVUCBidWlsZC4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v YmFzZS9kaWN0L2RpY3QwZGljdC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0 MGRpY3QuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9nMHJlY3YuaAogICAgICBz dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MG1vbi5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv aW5jbHVkZS90cngwc3lzLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3VuaXYuaQog ICAgICBzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwcmVjdi5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jh c2Uvb3Mvb3MwZmlsZS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdlMHppcC5jCiAg ICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBtb24uYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv cmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2Rp Y3QvZGljdDBkaWN0LmMJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDQyMTA4MTEw MC1xODA4ZmZnNndxN3EzZDEyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3Qu YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMTA5MjQ0NS0xMzMyOXA0dHFp Y2ZqNTgzCkBAIC01NDczLDkgKzU0NzMsOCBAQCBkaWN0X2Nsb3NlKHZvaWQpCiAJCXJ3X2xvY2tf ZnJlZSgmZGljdF90YWJsZV9zdGF0c19sYXRjaGVzW2ldKTsKIAl9CiB9Ci0jZW5kaWYgLyogIVVO SVZfSE9UQkFDS1VQICovCiAKLSNpZmRlZiBVTklWX0RFQlVHCisjIGlmZGVmIFVOSVZfREVCVUcK IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqLy8qKgogVmFsaWRhdGUgdGhlIGRpY3Rpb25hcnkgdGFibGUgTFJVIGxp c3QuCiBAcmV0dXJuIFRSVUUgaWYgdmFsaWQgICovCkBAIC01NTYwLDQgKzU1NTksNSBAQCBkaWN0 X25vbl9scnVfZmluZF90YWJsZSgKIAogCXJldHVybihGQUxTRSk7CiB9Ci0jZW5kaWYgLyogVU5J Vl9ERUJVRyAqLworIyBlbmRpZiAvKiBVTklWX0RFQlVHICovCisjZW5kaWYgLyogIVVOSVZfSE9U QkFDS1VQICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2Rp Y3QwZGljdC5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2 aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDQyMTA4MTEwMC1xODA4ZmZnNndxN3EzZDEy CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaAlyZXZpZDptYXJrby5t YWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMTA5MjQ0NS0xMzMyOXA0dHFpY2ZqNTgzCkBAIC02ODgs NiArNjg4LDcgQEAgdWxpbnQKIGRpY3RfdGFibGVfemlwX3NpemUoCiAvKj09PT09PT09PT09PT09 PT0qLwogCWNvbnN0IGRpY3RfdGFibGVfdCoJdGFibGUpOwkvKiE8IGluOiB0YWJsZSAqLworI2lm bmRlZiBVTklWX0hPVEJBQ0tVUAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIE9idGFpbiBleGNsdXNpdmUg bG9ja3Mgb24gYWxsIGluZGV4IHRyZWVzIG9mIHRoZSB0YWJsZS4gVGhpcyBpcyB0byBwcmV2ZW50 CiBhY2Nlc3NpbmcgaW5kZXggdHJlZXMgd2hpbGUgSW5ub0RCIGlzIHVwZGF0aW5nIGludGVybmFs IG1ldGFkYXRhIGZvcgpAQCAtNzE0LDcgKzcxNSw2IEBAIGRpY3RfdGFibGVfY29sX2luX2NsdXN0 ZXJlZF9rZXkoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLwogCWNvbnN0IGRpY3Rf dGFibGVfdCoJdGFibGUsCS8qITwgaW46IHRhYmxlICovCiAJdWxpbnQJCQluKTsJLyohPCBpbjog Y29sdW1uIG51bWJlciAqLwotI2lmbmRlZiBVTklWX0hPVEJBQ0tVUAogLyoqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq CiBDb3BpZXMgdHlwZXMgb2YgY29sdW1ucyBjb250YWluZWQgaW4gdGFibGUgdG8gdHVwbGUgYW5k IHNldHMgYWxsCiBmaWVsZHMgb2YgdGhlIHR1cGxlIHRvIHRoZSBTUUwgTlVMTCB2YWx1ZS4gIFRo aXMgZnVuY3Rpb24gc2hvdWxkCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9p bmNsdWRlL2xvZzByZWN2LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9sb2cwcmVj di5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTA0MjEwODExMDAtcTgwOGZmZzZ3 cTdxM2QxMgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9nMHJlY3YuaAlyZXZpZDpt YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMTA5MjQ0NS0xMzMyOXA0dHFpY2ZqNTgzCkBA IC00MCwxOSArNDAsMTcgQEAgUmVhZHMgdGhlIGNoZWNrcG9pbnQgaW5mbyBuZWVkZWQgaW4gaG90 CiBAcmV0dXJuCVRSVUUgaWYgc3VjY2VzcyAqLwogVU5JVl9JTlRFUk4KIGlib29sCi1yZWN2X3Jl YWRfY3BfaW5mb19mb3JfYmFja3VwKAotLyo9PT09PT09PT09PT09PT09PT09PT09PT09Ki8KK3Jl Y3ZfcmVhZF9jaGVja3BvaW50X2luZm9fZm9yX2JhY2t1cCgKKy8qPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ki8KIAljb25zdCBieXRlKgloZHIsCS8qITwgaW46IGJ1ZmZlciBjb250 YWluaW5nIHRoZSBsb2cgZ3JvdXAKIAkJCQloZWFkZXIgKi8KIAlsc25fdCoJCWxzbiwJLyohPCBv dXQ6IGNoZWNrcG9pbnQgbHNuICovCiAJbHNuX3QqCQlvZmZzZXQsCS8qITwgb3V0OiBjaGVja3Bv aW50IG9mZnNldCBpbiB0aGUgbG9nIGdyb3VwICovCi0JdWxpbnQqCQlmc3BfbGltaXQsLyohPCBv dXQ6IGZzcCBsaW1pdCBvZiBzcGFjZSAwLAotCQkJCTEwMDAwMDAwMDAgaWYgdGhlIGRhdGFiYXNl IGlzIHJ1bm5pbmcKLQkJCQl3aXRoIDwgdmVyc2lvbiAzLjIzLjUwIG9mIElubm9EQiAqLwotCWli X3VpbnQ2NF90KgljcF9ubywJLyohPCBvdXQ6IGNoZWNrcG9pbnQgbnVtYmVyICovCi0JbHNuX3Qq CQlmaXJzdF9oZWFkZXJfbHNuKTsKKwlsc25fdCoJCWNwX25vLAkvKiE8IG91dDogY2hlY2twb2lu dCBudW1iZXIgKi8KKwlsc25fdCoJCWZpcnN0X2hlYWRlcl9sc24pCiAJCQkJLyohPCBvdXQ6IGxz biBvZiBvZiB0aGUgc3RhcnQgb2YgdGhlCiAJCQkJZmlyc3QgbG9nIGZpbGUgKi8KKwlfX2F0dHJp YnV0ZV9fKChub25udWxsKSk7CiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFNjYW5zIHRoZSBsb2cgc2VnbWVu dCBhbmQgbl9ieXRlc19zY2FubmVkIGlzIHNldCB0byB0aGUgbGVuZ3RoIG9mIHZhbGlkCiBsb2cg c2Nhbm5lZC4gKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUv c3J2MG1vbi5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MG1vbi5oCXJldmlk OnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAxMTA0MjEwODExMDAtcTgwOGZmZzZ3cTdxM2QxMgor KysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3J2MG1vbi5oCXJldmlkOm1hcmtvLm1ha2Vs YUBvcmFjbGUuY29tLTIwMTEwNDIxMDkyNDQ1LTEzMzI5cDR0cWljZmo1ODMKQEAgLTI4LDYgKzI4 LDcgQEAgQ3JlYXRlZCAxMi8xNS8yMDA5CUppbW15IFlhbmcKICNkZWZpbmUgc3J2MG1vbl9oCiAK ICNpbmNsdWRlICJ1bml2LmkiCisjaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAKIAogLyoqIFBvc3Np YmxlIHN0YXR1cyB2YWx1ZXMgZm9yICJtb25fc3RhdHVzIiBpbiAic3RydWN0IG1vbml0b3JfdmFs dWUiICovCkBAIC03NTQsNSArNzU1LDkgQEAgc3J2X21vbl9kZWZhdWx0X29uKHZvaWQpOwogI2lm bmRlZiBVTklWX05PTklOTAogI2luY2x1ZGUgInNydjBtb24uaWMiCiAjZW5kaWYKKyNlbHNlIC8q ICFVTklWX0hPVEJBQ0tVUCAqLworIyBkZWZpbmUgTU9OSVRPUl9JTkMoeCkJCSgodm9pZCkgMCkK KyMgZGVmaW5lIE1PTklUT1JfREVDKHgpCQkoKHZvaWQpIDApCisjZW5kaWYgLyogIVVOSVZfSE9U QkFDS1VQICovCiAKICNlbmRpZgoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv aW5jbHVkZS90cngwc3lzLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwc3lz LmgJcmV2aWQ6dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDQyMTA4MTEwMC1xODA4ZmZnNndx N3EzZDEyCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwc3lzLmgJcmV2aWQ6bWFy a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjEwOTI0NDUtMTMzMjlwNHRxaWNmajU4MwpAQCAt Mzc5LDE0ICszNzksMTIgQEAgVU5JVl9JTlRFUk4KIHZvaWQKIHRyeF9zeXNfZmlsZV9mb3JtYXRf dGFnX2luaXQodm9pZCk7CiAvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0jaWZu ZGVmIFVOSVZfSE9UQkFDS1VQCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBTaHV0ZG93bi9DbG9zZSB0aGUgdHJh bnNhY3Rpb24gc3lzdGVtLiAqLwogVU5JVl9JTlRFUk4KIHZvaWQKIHRyeF9zeXNfY2xvc2Uodm9p ZCk7CiAvKj09PT09PT09PT09PT09PSovCi0jZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCiAv KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovLyoqCiBHZXQgdGhlIG5hbWUgcmVwcmVzZW50YXRpb24gb2YgdGhlIGZpbGUgZm9y bWF0IGZyb20gaXRzIGlkLgogQHJldHVybglwb2ludGVyIHRvIHRoZSBuYW1lICovCkBAIC00MDYs MzEgKzQwNCwyOCBAQCB0cnhfc3lzX2ZpbGVfZm9ybWF0X21heF9zZXQoCiAJdWxpbnQJCWZvcm1h dF9pZCwJLyohPCBpbjogZmlsZSBmb3JtYXQgaWQgKi8KIAljb25zdCBjaGFyKioJbmFtZSk7CQkv KiE8IG91dDogbWF4IGZpbGUgZm9ybWF0IG5hbWUgb3IKIAkJCQkJTlVMTCBpZiBub3QgbmVlZGVk LiAqLwotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqLy8qKgotR2V0IHRoZSBuYW1lIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBm aWxlIGZvcm1hdCBmcm9tIGl0cyBpZC4KLUByZXR1cm4JcG9pbnRlciB0byB0aGUgbWF4IGZvcm1h dCBuYW1lICovCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqCitDcmVhdGVzIHRoZSByb2xsYmFjayBzZWdtZW50cyAq LwogVU5JVl9JTlRFUk4KLWNvbnN0IGNoYXIqCi10cnhfc3lzX2ZpbGVfZm9ybWF0X21heF9nZXQo dm9pZCk7Ci0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KK3ZvaWQKK3RyeF9zeXNf Y3JlYXRlX3JzZWdzKAorLyo9PT09PT09PT09PT09PT09PSovCisJdWxpbnQJbl9yc2Vncyk7CS8q ITwgbnVtYmVyIG9mIHJvbGxiYWNrIHNlZ21lbnRzIHRvIGNyZWF0ZSAqLwogLyoqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q KgotQ2hlY2sgZm9yIHRoZSBtYXggZmlsZSBmb3JtYXQgdGFnIHN0b3JlZCBvbiBkaXNrLgotQHJl dHVybglEQl9TVUNDRVNTIG9yIGVycm9yIGNvZGUgKi8KLVVOSVZfSU5URVJOCitHZXQgdGhlIG51 bWJlciBvZiB0cmFuc2FjdGlvbiBpbiB0aGUgc3lzdGVtLCBpbmRlcGVuZGVudCBvZiB0aGVpciBz dGF0ZS4KK0ByZXR1cm4gY291bnQgb2YgdHJhbnNhY3Rpb25zIGluIHRyeF9zeXNfdDo6dHJ4X2xp c3QgKi8KK1VOSVZfSU5MSU5FCiB1bGludAotdHJ4X3N5c19maWxlX2Zvcm1hdF9tYXhfY2hlY2so Ci0vKj09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQl1bGludAkJbWF4X2Zvcm1hdF9pZCk7 CS8qITwgaW46IHRoZSBtYXggZm9ybWF0IGlkIHRvIGNoZWNrICovCi0vKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq Ci1VcGRhdGUgdGhlIGZpbGUgZm9ybWF0IHRhZyBpbiB0aGUgc3lzdGVtIHRhYmxlc3BhY2Ugb25s eSBpZiB0aGUgZ2l2ZW4KLWZvcm1hdCBpZCBpcyBncmVhdGVyIHRoYW4gdGhlIGtub3duIG1heCBp ZC4KLUByZXR1cm4JVFJVRSBpZiBmb3JtYXRfaWQgd2FzIGJpZ2dlciB0aGFuIHRoZSBrbm93biBt YXggaWQgKi8KK3RyeF9zeXNfZ2V0X25fdHJ4KHZvaWQpOworLyo9PT09PT09PT09PT09PT09PT09 Ki8KKworLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKgorQ2hlY2sgaWYgdGhlcmUgYXJlIGFueSBhY3RpdmUgKG5vbi1w cmVwYXJlZCkgdHJhbnNhY3Rpb25zLgorQHJldHVybiB0b3RhbCBudW1iZXIgb2YgYWN0aXZlIHRy YW5zYWN0aW9ucyBvciAwIGlmIG5vbmUgKi8KIFVOSVZfSU5URVJOCi1pYm9vbAotdHJ4X3N5c19m aWxlX2Zvcm1hdF9tYXhfdXBncmFkZSgKLS8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PSov Ci0JY29uc3QgY2hhcioqCW5hbWUsCQkvKiE8IG91dDogbWF4IGZpbGUgZm9ybWF0IG5hbWUgKi8K LQl1bGludAkJZm9ybWF0X2lkKTsJLyohPCBpbjogZmlsZSBmb3JtYXQgaWRlbnRpZmllciAqLwor dWxpbnQKK3RyeF9zeXNfYW55X2FjdGl2ZV90cmFuc2FjdGlvbnModm9pZCk7CisvKj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PSovCiAjZWxzZSAvKiAhVU5JVl9IT1RCQUNLVVAgKi8K IC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKi8vKioKIFByaW50cyB0byBzdGRlcnIgdGhlIE15U1FMIGJpbmxvZyBpbmZvIGlu IHRoZSBzeXN0ZW0gaGVhZGVyIGlmIHRoZQpAQCAtNDY3LDYgKzQ2MiwzMiBAQCB0cnhfc3lzX3Jl YWRfcGVydGFibGVfZmlsZV9mb3JtYXRfaWQoCiAJCQkJZGF0YWZpbGUgKi8KIAl1bGludCAqZm9y bWF0X2lkKTsJLyohPCBvdXQ6IGZpbGUgZm9ybWF0IG9mIHRoZSBwZXItdGFibGUKIAkJCQlkYXRh IGZpbGUgKi8KKyNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KKy8qKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0dl dCB0aGUgbmFtZSByZXByZXNlbnRhdGlvbiBvZiB0aGUgZmlsZSBmb3JtYXQgZnJvbSBpdHMgaWQu CitAcmV0dXJuCXBvaW50ZXIgdG8gdGhlIG1heCBmb3JtYXQgbmFtZSAqLworVU5JVl9JTlRFUk4K K2NvbnN0IGNoYXIqCit0cnhfc3lzX2ZpbGVfZm9ybWF0X21heF9nZXQodm9pZCk7CisvKj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ki8KKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKK0NoZWNrIGZvciB0aGUg bWF4IGZpbGUgZm9ybWF0IHRhZyBzdG9yZWQgb24gZGlzay4KK0ByZXR1cm4JREJfU1VDQ0VTUyBv ciBlcnJvciBjb2RlICovCitVTklWX0lOVEVSTgordWxpbnQKK3RyeF9zeXNfZmlsZV9mb3JtYXRf bWF4X2NoZWNrKAorLyo9PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJdWxpbnQJCW1heF9m b3JtYXRfaWQpOwkvKiE8IGluOiB0aGUgbWF4IGZvcm1hdCBpZCB0byBjaGVjayAqLworLyoqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqLy8qKgorVXBkYXRlIHRoZSBmaWxlIGZvcm1hdCB0YWcgaW4gdGhlIHN5c3RlbSB0YWJs ZXNwYWNlIG9ubHkgaWYgdGhlIGdpdmVuCitmb3JtYXQgaWQgaXMgZ3JlYXRlciB0aGFuIHRoZSBr bm93biBtYXggaWQuCitAcmV0dXJuCVRSVUUgaWYgZm9ybWF0X2lkIHdhcyBiaWdnZXIgdGhhbiB0 aGUga25vd24gbWF4IGlkICovCitVTklWX0lOVEVSTgoraWJvb2wKK3RyeF9zeXNfZmlsZV9mb3Jt YXRfbWF4X3VwZ3JhZGUoCisvKj09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworCWNvbnN0 IGNoYXIqKgluYW1lLAkJLyohPCBvdXQ6IG1heCBmaWxlIGZvcm1hdCBuYW1lICovCisJdWxpbnQJ CWZvcm1hdF9pZCk7CS8qITwgaW46IGZpbGUgZm9ybWF0IGlkZW50aWZpZXIgKi8KIC8qKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq Ki8vKioKIEdldCB0aGUgbmFtZSByZXByZXNlbnRhdGlvbiBvZiB0aGUgZmlsZSBmb3JtYXQgZnJv bSBpdHMgaWQuCiBAcmV0dXJuCXBvaW50ZXIgdG8gdGhlIG5hbWUgKi8KQEAgLTQ3NiwzMSArNDk3 LDYgQEAgdHJ4X3N5c19maWxlX2Zvcm1hdF9pZF90b19uYW1lKAogLyo9PT09PT09PT09PT09PT09 PT09PT09PT09PT0qLwogCWNvbnN0IHVsaW50CWlkKTsJLyohPCBpbjogaWQgb2YgdGhlIGZpbGUg Zm9ybWF0ICovCiAKLSNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KLQotLyoqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KgotQ3JlYXRlcyB0aGUgcm9sbGJhY2sgc2VnbWVudHMgKi8KLVVOSVZfSU5URVJOCi12b2lkCi10 cnhfc3lzX2NyZWF0ZV9yc2VncygKLS8qPT09PT09PT09PT09PT09PT0qLwotCXVsaW50CW5fcnNl Z3MpOwkvKiE8IG51bWJlciBvZiByb2xsYmFjayBzZWdtZW50cyB0byBjcmVhdGUgKi8KLS8qKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKi8vKioKLUdldCB0aGUgbnVtYmVyIG9mIHRyYW5zYWN0aW9uIGluIHRoZSBzeXN0ZW0sIGlu ZGVwZW5kZW50IG9mIHRoZWlyIHN0YXRlLgotQHJldHVybiBjb3VudCBvZiB0cmFuc2FjdGlvbnMg aW4gdHJ4X3N5c190Ojp0cnhfbGlzdCAqLwotVU5JVl9JTkxJTkUKLXVsaW50Ci10cnhfc3lzX2dl dF9uX3RyeCh2b2lkKTsKLS8qPT09PT09PT09PT09PT09PT09PSovCi0KLS8qKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioK LUNoZWNrIGlmIHRoZXJlIGFyZSBhbnkgYWN0aXZlIChub24tcHJlcGFyZWQpIHRyYW5zYWN0aW9u cy4KLUByZXR1cm4gdG90YWwgbnVtYmVyIG9mIGFjdGl2ZSB0cmFuc2FjdGlvbnMgb3IgMCBpZiBu b25lICovCi1VTklWX0lOVEVSTgotdWxpbnQKLXRyeF9zeXNfYW55X2FjdGl2ZV90cmFuc2FjdGlv bnModm9pZCk7Ci0vKj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCi0KICNpZmRl ZiBVTklWX0RFQlVHCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKi8vKioKIFZhbGlkYXRlIHRoZSB0cnhfc3lzX3Q6OnRyeF9saXN0 LiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2Lmkn Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6dmFzaWwuZGltb3ZA b3JhY2xlLmNvbS0yMDExMDQyMTA4MTEwMC1xODA4ZmZnNndxN3EzZDEyCisrKyBiL3N0b3JhZ2Uv aW5ub2Jhc2UvaW5jbHVkZS91bml2LmkJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx MTA0MjEwOTI0NDUtMTMzMjlwNHRxaWNmajU4MwpAQCAtMTMyLDcgKzEzMiw3IEBAIFN1biBTdHVk aW8gKi8KIC8qIEZvbGxvd2luZyBkZWZpbmVzIGFyZSB0byBlbmFibGUgcGVyZm9ybWFuY2Ugc2No ZW1hCiBpbnN0cnVtZW50YXRpb24gaW4gZWFjaCBvZiBmb3VyIElubm9EQiBtb2R1bGVzIGlmCiBI QVZFX1BTSV9JTlRFUkZBQ0UgaXMgZGVmaW5lZC4gKi8KLSNpZmRlZiBIQVZFX1BTSV9JTlRFUkZB Q0UKKyNpZiBkZWZpbmVkIEhBVkVfUFNJX0lOVEVSRkFDRSAmJiAhZGVmaW5lZCBVTklWX0hPVEJB Q0tVUAogIyBkZWZpbmUgVU5JVl9QRlNfTVVURVgKICMgZGVmaW5lIFVOSVZfUEZTX1JXTE9DSwog LyogRm9yIEkvTyBpbnN0cnVtZW50YXRpb24sIHBlcmZvcm1hbmNlIHNjaGVtYSByZWx5Cgo9PT0g bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuYycKLS0tIGEvc3Rv cmFnZS9pbm5vYmFzZS9sb2cvbG9nMHJlY3YuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29t LTIwMTEwNDIxMDgxMTAwLXE4MDhmZmc2d3E3cTNkMTIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9s b2cvbG9nMHJlY3YuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQyMTA5MjQ0 NS0xMzMyOXA0dHFpY2ZqNTgzCkBAIC03NjgsOCArNzY4LDggQEAgcmVjdl9yZWFkX2NoZWNrcG9p bnRfaW5mb19mb3JfYmFja3VwKAogCQkJCWhlYWRlciAqLwogCWxzbl90KgkJbHNuLAkvKiE8IG91 dDogY2hlY2twb2ludCBsc24gKi8KIAlsc25fdCoJCW9mZnNldCwJLyohPCBvdXQ6IGNoZWNrcG9p bnQgb2Zmc2V0IGluIHRoZSBsb2cgZ3JvdXAgKi8KLQlpYl91aW50NjRfdCoJY3Bfbm8sCS8qITwg b3V0OiBjaGVja3BvaW50IG51bWJlciAqLwotCWliX3VpbnQ2NF90KglmaXJzdF9oZWFkZXJfbHNu KQorCWxzbl90KgkJY3Bfbm8sCS8qITwgb3V0OiBjaGVja3BvaW50IG51bWJlciAqLworCWxzbl90 KgkJZmlyc3RfaGVhZGVyX2xzbikKIAkJCQkvKiE8IG91dDogbHNuIG9mIG9mIHRoZSBzdGFydCBv ZiB0aGUKIAkJCQlmaXJzdCBsb2cgZmlsZSAqLwogewoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3Jh Z2UvaW5ub2Jhc2Uvb3Mvb3MwZmlsZS5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL29zL29zMGZp bGUuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEwNDIxMDgxMTAwLXE4MDhmZmc2 d3E3cTNkMTIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9vcy9vczBmaWxlLmMJcmV2aWQ6bWFya28u bWFrZWxhQG9yYWNsZS5jb20tMjAxMTA0MjEwOTI0NDUtMTMzMjlwNHRxaWNmajU4MwpAQCAtMzA0 LDYgKzMwNCw3IEBAIFVOSVZfSU5URVJOIHVsaW50CW9zX25fcGVuZGluZ193cml0ZXMgPQogVU5J Vl9JTlRFUk4gdWxpbnQJb3Nfbl9wZW5kaW5nX3JlYWRzID0gMDsKIAogI2lmZGVmIFVOSVZfREVC VUcKKyMgaWZuZGVmIFVOSVZfSE9UQkFDS1VQCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFZhbGlkYXRl cyB0aGUgY29uc2lzdGVuY3kgdGhlIGFpbyBzeXN0ZW0gc29tZSBvZiB0aGUgdGltZS4KIEByZXR1 cm4JVFJVRSBpZiBvayBvciB0aGUgY2hlY2sgd2FzIHNraXBwZWQgKi8KQEAgLTMzMCw2ICszMzEs NyBAQCBvc19haW9fdmFsaWRhdGVfc2tpcCh2b2lkKQogCW9zX2Fpb192YWxpZGF0ZV9jb3VudCA9 IE9TX0FJT19WQUxJREFURV9TS0lQOwogCXJldHVybihvc19haW9fdmFsaWRhdGUoKSk7CiB9Cisj IGVuZGlmIC8qICFVTklWX0hPVEJBQ0tVUCAqLwogI2VuZGlmIC8qIFVOSVZfREVCVUcgKi8KIAog I2lmZGVmIF9fV0lOX18KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3BhZ2Uv cGFnZTB6aXAuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9wYWdlL3BhZ2UwemlwLmMJcmV2aWQ6 dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDExMDQyMTA4MTEwMC1xODA4ZmZnNndxN3EzZDEyCisr KyBiL3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdlMHppcC5jCXJldmlkOm1hcmtvLm1ha2VsYUBv cmFjbGUuY29tLTIwMTEwNDIxMDkyNDQ1LTEzMzI5cDR0cWljZmo1ODMKQEAgLTQ2LDcgKzQ2LDYg QEAgQ3JlYXRlZCBKdW5lIDIwMDUgYnkgTWFya28gTWFrZWxhCiAjZWxzZSAvKiAhVU5JVl9IT1RC QUNLVVAgKi8KICMgZGVmaW5lIGxvY2tfbW92ZV9yZW9yZ2FuaXplX3BhZ2UoYmxvY2ssIHRlbXBf YmxvY2spCSgodm9pZCkgMCkKICMgZGVmaW5lIGJ1Zl9MUlVfc3RhdF9pbmNfdW56aXAoKQkJCSgo dm9pZCkgMCkKLSMgZGVmaW5lIE1PTklUT1JfSU5DKHgpCQkJCQkoKHZvaWQpIDApCiAjZW5kaWYg LyogIVVOSVZfSE9UQkFDS1VQICovCiAKICNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKCj09PSBtb2Rp ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Nydi9zcnYwbW9uLmMnCi0tLSBhL3N0b3JhZ2Uv aW5ub2Jhc2Uvc3J2L3NydjBtb24uYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTEw NDIxMDgxMTAwLXE4MDhmZmc2d3E3cTNkMTIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9zcnYvc3J2 MG1vbi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNDIxMDkyNDQ1LTEzMzI5 cDR0cWljZmo1ODMKQEAgLTIzLDYgKzIzLDcgQEAgRGF0YWJhc2UgbW9uaXRvciBjb3VudGVyIGlu dGVyZmFjZXMKIENyZWF0ZWQgMTIvOS8yMDA5IEppbW15IFlhbmcKICoqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiAKKyNpZm5kZWYgVU5JVl9I T1RCQUNLVVAKICNpbmNsdWRlICJvczBmaWxlLmgiCiAjaW5jbHVkZSAibWFjaDBkYXRhLmgiCiAj aW5jbHVkZSAic3J2MG1vbi5oIgpAQCAtMTUyMCw0ICsxNTIxLDQgQEAgc3J2X21vbl9kZWZhdWx0 X29uKHZvaWQpCiAJCX0KIAl9CiB9Ci0KKyNlbmRpZiAvKiAhVU5JVl9IT1RCQUNLVVAgKi8KCg== --===============0845196306== 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.6-innodb/ # testament_sha1: 0dde4a2c2b007eb8f8fb7225272ad9e5cad07c38 # timestamp: 2011-04-21 12:24:58 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@stripped\ # q808ffg6wq7q3d12 # # Begin bundle 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 AvZwBs7b94CMkTCk5jv4VuT/F3JFOFCQLfpL6Q== --===============0845196306==--