From: marko.makela Date: August 23 2011 10:47am Subject: bzr push into mysql-5.5 branch (marko.makela:3501 to 3502) List-Archive: http://lists.mysql.com/commits/140777 Message-Id: <201108231047.p7NAlxM8028017@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM1MDIgTWFya28gTcOka2Vsw6QJMjAxMS0wOC0yMiBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIGV4dHJhL2lubm9jaGVja3N1 bS5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHN5bmMuYwogMzUwMSBKb2VyZyBC cnVlaGUJMjAxMS0wOC0xOSBbbWVyZ2VdCiAgICAgIE51bGwtdXBtZXJnZSB0aGUgYnVnIzM3MTY1 IGZpeDogTm8gZnVuY3Rpb25hbCBjaGFuZ2UsCiAgICAgIGJ1dCBzb21lIG5vdGF0aW9uIGltcHJv dmVtZW50IGlzIGFwcGxpY2FibGUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN1cHBvcnQtZmlsZXMv bXlzcWwuc3BlYy5zaAo9PT0gbW9kaWZpZWQgZmlsZSAnZXh0cmEvaW5ub2NoZWNrc3VtLmMnCi0t LSBhL2V4dHJhL2lubm9jaGVja3N1bS5jCXJldmlkOmpvZXJnLmJydWVoZUBvcmFjbGUuY29tLTIw MTEwODE5MTcyNjI3LWc0b3Z6N3E4b2pmZHBqcjAKKysrIGIvZXh0cmEvaW5ub2NoZWNrc3VtLmMJ cmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTA4MjIxNDEyMjctZDM4Z2xmeDFhZGZm MGQyagpAQCAtMjUsMTIgKzI1LDcgQEAKICAgUHVibGlzaGVkIHdpdGggYSBwZXJtaXNzaW9uLgog Ki8KIAotLyogbmVlZGVkIHRvIGhhdmUgYWNjZXNzIHRvIDY0IGJpdCBmaWxlIGZ1bmN0aW9ucyAq LwotI2RlZmluZSBfTEFSR0VGSUxFX1NPVVJDRQotI2RlZmluZSBfTEFSR0VGSUxFNjRfU09VUkNF Ci0KLSNkZWZpbmUgX1hPUEVOX1NPVVJDRSA1MDAgLyogbmVlZGVkIHRvIGluY2x1ZGUgZ2V0b3B0 Lmggb24gc29tZSBwbGF0Zm9ybXMuICovCi0KKyNpbmNsdWRlIDxteV9nbG9iYWwuaD4KICNpbmNs dWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHRpbWUuaD4KQEAg LTUzLDcgKzQ4LDYgQEAKIC8qIGFub3RoZXIgYXJndW1lbnQgdG8gc3BlY2lmeSBwYWdlIHJhbmdl cy4uLiBzZWVrIHRvIHJpZ2h0IHNwb3QgYW5kIGdvIGZyb20gdGhlcmUgKi8KIAogdHlwZWRlZiB1 bnNpZ25lZCBsb25nIGludCB1bGludDsKLXR5cGVkZWYgdW5zaWduZWQgY2hhciB1Y2hhcjsKIAog LyogaW5ub2RiIGZ1bmN0aW9uIGluIG5hbWU7IG1vZGlmaWVkIHNsaWdodGx5IHRvIG5vdCBoYXZl IHRoZSBBU00gdmVyc2lvbiAobG90cyBvZiAjaWZzIHRoYXQgZGlkbid0IGFwcGx5KSAqLwogdWxp bnQgbWFjaF9yZWFkX2Zyb21fNCh1Y2hhciAqYikKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdl L2lubm9iYXNlL3N5bmMvc3luYzBzeW5jLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9z eW5jMHN5bmMuYwlyZXZpZDpqb2VyZy5icnVlaGVAb3JhY2xlLmNvbS0yMDExMDgxOTE3MjYyNy1n NG92ejdxOG9qZmRwanIwCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHN5bmMuYwly ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDgyMjE0MTIyNy1kMzhnbGZ4MWFkZmYw ZDJqCkBAIC0xMzI5LDcgKzEzMjksMTMgQEAgc3luY190aHJlYWRfYWRkX2xldmVsKAogCQkJCQkg ICAgIFRSVUUpKTsKIAkJYnJlYWs7CiAJY2FzZSBTWU5DX0lCVUZfVFJFRV9OT0RFX05FVzoKLQkJ dXRfYShzeW5jX3RocmVhZF9sZXZlbHNfY29udGFpbihhcnJheSwgU1lOQ19JQlVGX01VVEVYKSk7 CisJCS8qIGlidWZfYWRkX2ZyZWVfcGFnZSgpIGFsbG9jYXRlcyBuZXcgcGFnZXMgZm9yIHRoZQor CQljaGFuZ2UgYnVmZmVyIHdoaWxlIG9ubHkgaG9sZGluZyB0aGUgdGFibGVzcGFjZQorCQl4LWxh dGNoLiBUaGVzZSBwcmUtYWxsb2NhdGVkIG5ldyBwYWdlcyBtYXkgb25seSBiZQorCQl0YWtlbiBp biB1c2Ugd2hpbGUgaG9sZGluZyBpYnVmX211dGV4LCBpbgorCQlidHJfcGFnZV9hbGxvY19mb3Jf aWJ1ZigpLiAqLworCQl1dF9hKHN5bmNfdGhyZWFkX2xldmVsc19jb250YWluKGFycmF5LCBTWU5D X0lCVUZfTVVURVgpCisJCSAgICAgfHwgc3luY190aHJlYWRfbGV2ZWxzX2NvbnRhaW4oYXJyYXks IFNZTkNfRlNQKSk7CiAJCWJyZWFrOwogCWNhc2UgU1lOQ19JQlVGX0lOREVYX1RSRUU6CiAJCWlm IChzeW5jX3RocmVhZF9sZXZlbHNfY29udGFpbihhcnJheSwgU1lOQ19GU1ApKSB7CgpObyBidW5k bGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==