From: marko.makela Date: November 8 2011 12:38pm Subject: bzr push into mysql-trunk branch (marko.makela:3574 to 3575) List-Archive: http://lists.mysql.com/commits/141852 Message-Id: <201111081238.pA8CcLSE028996@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM1NzUgTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz ZS9idHIvYnRyMHBjdXIuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIu aAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIuaWMKIDM1NzQgSm9uIE9s YXYgSGF1Z2xpZAkyMDExLTExLTA4CiAgICAgIEZpeCBnY2MgNC42LjEgY29tcGlsYXRpb24gZXJy b3I6CiAgICAgIGVycm9yOiB2YXJpYWJsZSDigJhpbmZv4oCZIHNldCBidXQgbm90IHVzZWQKCiAg ICBtb2RpZmllZDoKICAgICAgc3FsL21kbC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p bm5vYmFzZS9idHIvYnRyMHBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHBj dXIuYwlyZXZpZDpqb24uaGF1Z2xpZEBvcmFjbGUuY29tLTIwMTExMTA4MDk1OTEyLTl6cTB1bXlt YW9qMzdmeTcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHBjdXIuYwlyZXZpZDptYXJr by5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwODEyMzUxOS1xbjE1NWhwenl0ZHEwZmR0CkBAIC0y NDcsNiArMjQ3LDggQEAgYnRyX3BjdXJfcmVzdG9yZV9wb3NpdGlvbl9mdW5jKAogCQkJY3Vyc29y LT5yZWxfcG9zID09IEJUUl9QQ1VSX0JFRk9SRV9GSVJTVF9JTl9UUkVFLAogCQkJaW5kZXgsIGxh dGNoX21vZGUsIGJ0cl9wY3VyX2dldF9idHJfY3VyKGN1cnNvciksIG10cik7CiAKKwkJY3Vyc29y LT5sYXRjaF9tb2RlID0gbGF0Y2hfbW9kZTsKKwkJY3Vyc29yLT5wb3Nfc3RhdGUgPSBCVFJfUENV Ul9JU19QT1NJVElPTkVEOwogCQljdXJzb3ItPmJsb2NrX3doZW5fc3RvcmVkID0gYnRyX3BjdXJf Z2V0X2Jsb2NrKGN1cnNvcik7CiAKIAkJcmV0dXJuKEZBTFNFKTsKCj09PSBtb2RpZmllZCBmaWxl ICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIuaCcKLS0tIGEvc3RvcmFnZS9pbm5v YmFzZS9pbmNsdWRlL2J0cjBwY3VyLmgJcmV2aWQ6am9uLmhhdWdsaWRAb3JhY2xlLmNvbS0yMDEx MTEwODA5NTkxMi05enEwdW15bWFvajM3Znk3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVk ZS9idHIwcGN1ci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMTA4MTIzNTE5 LXFuMTU1aHB6eXRkcTBmZHQKQEAgLTI2NCwxNCArMjY0LDYgQEAgYnRyX3BjdXJfY29tbWl0X3Nw ZWNpZnlfbXRyKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT0qLwogCWJ0cl9wY3VyX3QqCXBj dXIsCS8qITwgaW46IHBlcnNpc3RlbnQgY3Vyc29yICovCiAJbXRyX3QqCQltdHIpOwkvKiE8IGlu OiBtdHIgdG8gY29tbWl0ICovCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1UZXN0cyBpZiBhIGN1cnNvciBpcyBkZXRh Y2hlZDogdGhhdCBpcyB0aGUgbGF0Y2ggbW9kZSBpcyBCVFJfTk9fTEFUQ0hFUy4KLUByZXR1cm4J VFJVRSBpZiBkZXRhY2hlZCAqLwotVU5JVl9JTkxJTkUKLWlib29sCi1idHJfcGN1cl9pc19kZXRh Y2hlZCgKLS8qPT09PT09PT09PT09PT09PT0qLwotCWJ0cl9wY3VyX3QqCXBjdXIpOwkvKiE8IGlu OiBwZXJzaXN0ZW50IGN1cnNvciAqLwogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIE1vdmVzIHRoZSBwZXJzaXN0ZW50IGN1cnNv ciB0byB0aGUgbmV4dCByZWNvcmQgaW4gdGhlIHRyZWUuIElmIG5vIHJlY29yZHMgYXJlCiBsZWZ0 LCB0aGUgY3Vyc29yIHN0YXlzICdhZnRlciBsYXN0IGluIHRyZWUnLgoKPT09IG1vZGlmaWVkIGZp bGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5pYycKLS0tIGEvc3RvcmFnZS9p bm5vYmFzZS9pbmNsdWRlL2J0cjBwY3VyLmljCXJldmlkOmpvbi5oYXVnbGlkQG9yYWNsZS5jb20t MjAxMTExMDgwOTU5MTItOXpxMHVteW1hb2ozN2Z5NworKysgYi9zdG9yYWdlL2lubm9iYXNlL2lu Y2x1ZGUvYnRyMHBjdXIuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDgx MjM1MTktcW4xNTVocHp5dGRxMGZkdApAQCAtMzg5LDM4ICszODksNiBAQCBidHJfcGN1cl9jb21t aXRfc3BlY2lmeV9tdHIoCiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVNldHMgdGhlIHBjdXIgbGF0Y2ggbW9k ZSB0byBCVFJfTk9fTEFUQ0hFUy4gKi8KLVVOSVZfSU5MSU5FCi12b2lkCi1idHJfcGN1cl9kZXRh Y2goCi0vKj09PT09PT09PT09PSovCi0JYnRyX3BjdXJfdCoJcGN1cikJLyohPCBpbjogcGVyc2lz dGVudCBjdXJzb3IgKi8KLXsKLQl1dF9hKHBjdXItPnBvc19zdGF0ZSA9PSBCVFJfUENVUl9JU19Q T1NJVElPTkVEKTsKLQotCXBjdXItPmxhdGNoX21vZGUgPSBCVFJfTk9fTEFUQ0hFUzsKLQotCXBj dXItPnBvc19zdGF0ZSA9IEJUUl9QQ1VSX1dBU19QT1NJVElPTkVEOwotfQotCi0vKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoq Ci1UZXN0cyBpZiBhIGN1cnNvciBpcyBkZXRhY2hlZDogdGhhdCBpcyB0aGUgbGF0Y2ggbW9kZSBp cyBCVFJfTk9fTEFUQ0hFUy4KLUByZXR1cm4JVFJVRSBpZiBkZXRhY2hlZCAqLwotVU5JVl9JTkxJ TkUKLWlib29sCi1idHJfcGN1cl9pc19kZXRhY2hlZCgKLS8qPT09PT09PT09PT09PT09PT0qLwot CWJ0cl9wY3VyX3QqCXBjdXIpCS8qITwgaW46IHBlcnNpc3RlbnQgY3Vyc29yICovCi17Ci0JaWYg KHBjdXItPmxhdGNoX21vZGUgPT0gQlRSX05PX0xBVENIRVMpIHsKLQotCQlyZXR1cm4oVFJVRSk7 Ci0JfQotCi0JcmV0dXJuKEZBTFNFKTsKLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogU2V0cyB0aGUgb2xkX3Jl Y19idWYgZmllbGQgdG8gTlVMTC4gKi8KIFVOSVZfSU5MSU5FCiB2b2lkCgpObyBidW5kbGUgKHJl YXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==