From: marko.makela
Date: November 8 2011 12:39pm
Subject: bzr push into mysql-5.5 branch (marko.makela:3597 to 3598)
List-Archive: http://lists.mysql.com/commits/141851
Message-Id: <201111081239.pA8CdXCH025795@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1OTggTWFya28gTcOka2Vsw6QJMjAxMS0xMS0wOCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuMSB0byBteXNxbC01LjUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
YnRyL2J0cjBwY3VyLmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBwY3VyLmgK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBwY3VyLmljCiAzNTk3IE1hcmtvIE3D
pGtlbMOkCTIwMTEtMTEtMDgKICAgICAgUmVwbGFjZSB2b2lkIHBvaW50ZXIgYXJpdGhtZXRpY3Mg
d2l0aCBieXRlIHBvaW50ZXIgYXJpdGhtZXRpY3MuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9idHIvYnRyMHBjdXIuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMHBj
dXIuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTEwODA2NTQ1Mi05bzYwNWsz
cjZ4bTU5czA0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvYnRyL2J0cjBwY3VyLmMJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDgxMjMwNTgtY2xwMTMwaWN5bzNmcjlpYgpAQCAt
MjQ3LDYgKzI0Nyw4IEBAIGJ0cl9wY3VyX3Jlc3RvcmVfcG9zaXRpb25fZnVuYygKIAkJCWN1cnNv
ci0+cmVsX3BvcyA9PSBCVFJfUENVUl9CRUZPUkVfRklSU1RfSU5fVFJFRSwKIAkJCWluZGV4LCBs
YXRjaF9tb2RlLCBidHJfcGN1cl9nZXRfYnRyX2N1cihjdXJzb3IpLCBtdHIpOwogCisJCWN1cnNv
ci0+bGF0Y2hfbW9kZSA9IGxhdGNoX21vZGU7CisJCWN1cnNvci0+cG9zX3N0YXRlID0gQlRSX1BD
VVJfSVNfUE9TSVRJT05FRDsKIAkJY3Vyc29yLT5ibG9ja193aGVuX3N0b3JlZCA9IGJ0cl9wY3Vy
X2dldF9ibG9jayhjdXJzb3IpOwogCiAJCXJldHVybihGQUxTRSk7Cgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBwY3VyLmgnCi0tLSBhL3N0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9idHIwcGN1ci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTExMTA4MDY1NDUyLTlvNjA1azNyNnhtNTlzMDQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2J0cjBwY3VyLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTExMDgxMjMw
NTgtY2xwMTMwaWN5bzNmcjlpYgpAQCAtMjYzLDE0ICsyNjMsNiBAQCBidHJfcGN1cl9jb21taXRf
c3BlY2lmeV9tdHIoCiAvKj09PT09PT09PT09PT09PT09PT09PT09PSovCiAJYnRyX3BjdXJfdCoJ
cGN1ciwJLyohPCBpbjogcGVyc2lzdGVudCBjdXJzb3IgKi8KIAltdHJfdCoJCW10cik7CS8qITwg
aW46IG10ciB0byBjb21taXQgKi8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVRlc3RzIGlmIGEgY3Vyc29yIGlzIGRl
dGFjaGVkOiB0aGF0IGlzIHRoZSBsYXRjaCBtb2RlIGlzIEJUUl9OT19MQVRDSEVTLgotQHJldHVy
bglUUlVFIGlmIGRldGFjaGVkICovCi1VTklWX0lOTElORQotaWJvb2wKLWJ0cl9wY3VyX2lzX2Rl
dGFjaGVkKAotLyo9PT09PT09PT09PT09PT09PSovCi0JYnRyX3BjdXJfdCoJcGN1cik7CS8qITwg
aW46IHBlcnNpc3RlbnQgY3Vyc29yICovCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogTW92ZXMgdGhlIHBlcnNpc3RlbnQgY3Vy
c29yIHRvIHRoZSBuZXh0IHJlY29yZCBpbiB0aGUgdHJlZS4gSWYgbm8gcmVjb3JkcyBhcmUKIGxl
ZnQsIHRoZSBjdXJzb3Igc3RheXMgJ2FmdGVyIGxhc3QgaW4gdHJlZScuCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBwY3VyLmljJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvYnRyMHBjdXIuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMTExMDgwNjU0NTItOW82MDVrM3I2eG01OXMwNAorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvYnRyMHBjdXIuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTEx
MDgxMjMwNTgtY2xwMTMwaWN5bzNmcjlpYgpAQCAtMzg5LDM4ICszODksNiBAQCBidHJfcGN1cl9j
b21taXRfc3BlY2lmeV9tdHIoCiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLVNldHMgdGhlIHBjdXIgbGF0Y2gg
bW9kZSB0byBCVFJfTk9fTEFUQ0hFUy4gKi8KLVVOSVZfSU5MSU5FCi12b2lkCi1idHJfcGN1cl9k
ZXRhY2goCi0vKj09PT09PT09PT09PSovCi0JYnRyX3BjdXJfdCoJcGN1cikJLyohPCBpbjogcGVy
c2lzdGVudCBjdXJzb3IgKi8KLXsKLQl1dF9hKHBjdXItPnBvc19zdGF0ZSA9PSBCVFJfUENVUl9J
U19QT1NJVElPTkVEKTsKLQotCXBjdXItPmxhdGNoX21vZGUgPSBCVFJfTk9fTEFUQ0hFUzsKLQot
CXBjdXItPnBvc19zdGF0ZSA9IEJUUl9QQ1VSX1dBU19QT1NJVElPTkVEOwotfQotCi0vKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
LyoqCi1UZXN0cyBpZiBhIGN1cnNvciBpcyBkZXRhY2hlZDogdGhhdCBpcyB0aGUgbGF0Y2ggbW9k
ZSBpcyBCVFJfTk9fTEFUQ0hFUy4KLUByZXR1cm4JVFJVRSBpZiBkZXRhY2hlZCAqLwotVU5JVl9J
TkxJTkUKLWlib29sCi1idHJfcGN1cl9pc19kZXRhY2hlZCgKLS8qPT09PT09PT09PT09PT09PT0q
LwotCWJ0cl9wY3VyX3QqCXBjdXIpCS8qITwgaW46IHBlcnNpc3RlbnQgY3Vyc29yICovCi17Ci0J
aWYgKHBjdXItPmxhdGNoX21vZGUgPT0gQlRSX05PX0xBVENIRVMpIHsKLQotCQlyZXR1cm4oVFJV
RSk7Ci0JfQotCi0JcmV0dXJuKEZBTFNFKTsKLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogU2V0cyB0aGUgb2xk
X3JlY19idWYgZmllbGQgdG8gTlVMTC4gKi8KIFVOSVZfSU5MSU5FCiB2b2lkCgpObyBidW5kbGUg
KHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==