From: marko.makela
Date: May 24 2012 12:13pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3862 to 3863) WL#6255
List-Archive: http://lists.mysql.com/commits/143943
Message-Id: <201205241213.q4OCDj0i005145@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NjMgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNAogICAgICBXTCM2MjU1IHByZXBhcmF0aW9u
LCB0byBhbGxvdyBjcmVhdGlvbiBvZiBhIGR1bW15IHF1ZV90aHJfdCBvYmplY3QuCiAgICAgIAog
ICAgICBwYXJzX2NvbXBsZXRlX2dyYXBoX2Zvcl9leGVjKCk6IEFsbG93IG5vZGU9TlVMTC4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3BhcnMwcGFycy5oCiAg
ICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcGFycy9wYXJzMHBhcnMuY2MKIDM4NjIgTWFya28gTcOka2Vs
w6QJMjAxMi0wNS0yNAogICAgICBGaXggZXJyb3JzIGluIHRoZSByZWNfZ2V0X29mZnNldHMoKSBl
bGltaW5hdGlvbi4KICAgICAgCiAgICAgIGJ0cl9yb290X3JhaXNlX2FuZF9pbnNlcnQoKSwgYnRy
X3BhZ2Vfc3BsaXRfYW5kX2luc2VydCgpLAogICAgICBidHJfY3VyX3Blc3NpbWlzdGljX2luc2Vy
dCgpOiBOb3RlIHRoYXQgdGhlIG1lbW9yeSBoZWFwIGZvciBvZmZzZXRzCiAgICAgIGNhbiBiZSBl
bXB0aWVkLgogICAgICAKICAgICAgYnRyX2N1cl9wZXNzaW1pc3RpY191cGRhdGUoKSwgcm93X2lu
c19zZWNfaW5kZXhfZW50cnlfYnlfbW9kaWZ5KCksCiAgICAgIHJvd19pbnNfc2VjX2luZGV4X2Vu
dHJ5X2xvdygpLCByb3dfbG9nX2FwcGx5X29wX2xvdygpLAogICAgICByb3dfbG9nX2FwcGx5X29w
KCksIHJvd191bmRvX21vZF9jbHVzdF9sb3coKTogQWRkIG9mZnNldHNfaGVhcCBmb3IKICAgICAg
YWxsb2NhdGluZyBvZmZzZXRzIG9ubHkuIE5vdGUgdGhhdCBpdCBjYW4gYmUgZW1wdGllZC4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwogICAgICBz
dG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS9idHIwYnRyLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBjdXIu
aAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2Uvcm93L3JvdzBsb2cuY2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVtb2Qu
Y2MKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jYwo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3BhcnMwcGFycy5oJwotLS0gYS9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcGFyczBwYXJzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA1MjQxMTEyMjMtMWwwMjcyc2I5dXBpbGFpMgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvcGFyczBwYXJzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjQx
MjEyMjgtNXgxczVzNzRuOHAzZXlnbwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTYsIDIwMTEsIE9yYWNsZSBhbmQvb3IgaXRzIGFmZmls
aWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTYsIDIwMTIsIE9y
YWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRoaXMg
cHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3Ig
bW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNl
bnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNDY5LDkgKzQ2OSwxMCBA
QCBxdWVfdGhyX3QqCiBwYXJzX2NvbXBsZXRlX2dyYXBoX2Zvcl9leGVjKAogLyo9PT09PT09PT09
PT09PT09PT09PT09PT09Ki8KIAlxdWVfbm9kZV90Kglub2RlLAkvKiE8IGluOiByb290IG5vZGUg
Zm9yIGFuIGluY29tcGxldGUKLQkJCQlxdWVyeSBncmFwaCAqLworCQkJCXF1ZXJ5IGdyYXBoLCBv
ciBOVUxMIGZvciBkdW1teSBncmFwaCAqLwogCXRyeF90KgkJdHJ4LAkvKiE8IGluOiB0cmFuc2Fj
dGlvbiBoYW5kbGUgKi8KLQltZW1faGVhcF90KgloZWFwKTsJLyohPCBpbjogbWVtb3J5IGhlYXAg
ZnJvbSB3aGljaCBhbGxvY2F0ZWQgKi8KKwltZW1faGVhcF90KgloZWFwKQkvKiE8IGluOiBtZW1v
cnkgaGVhcCBmcm9tIHdoaWNoIGFsbG9jYXRlZCAqLworCV9fYXR0cmlidXRlX18oKG5vbm51bGwo
MiwzKSwgd2Fybl91bnVzZWRfcmVzdWx0KSk7CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgogQ3JlYXRlIHBhcnNl
ciBpbmZvIHN0cnVjdC4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3BhcnMv
cGFyczBwYXJzLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3BhcnMvcGFyczBwYXJzLmNjCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI0MTExMjIzLTFsMDI3MnNiOXVwaWxh
aTIKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9wYXJzL3BhcnMwcGFycy5jYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyNDEyMTIyOC01eDFzNXM3NG44cDNleWdvCkBAIC0xLDYg
KzEsNiBAQAogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqCiAKLUNvcHlyaWdodCAoYykgMTk5NiwgMjAx
MSwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KK0Nv
cHlyaWdodCAoYykgMTk5NiwgMjAxMiwgT3JhY2xlIGFuZC9vciBpdHMgYWZmaWxpYXRlcy4gQWxs
IFJpZ2h0cyBSZXNlcnZlZC4KIAogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj
YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkgaXQgdW5kZXIKIHRoZSB0ZXJtcyBvZiB0
aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNv
ZnR3YXJlCkBAIC0yMjUyLDcgKzIyNTIsNyBAQCBxdWVfdGhyX3QqCiBwYXJzX2NvbXBsZXRlX2dy
YXBoX2Zvcl9leGVjKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09Ki8KIAlxdWVfbm9kZV90
Kglub2RlLAkvKiE8IGluOiByb290IG5vZGUgZm9yIGFuIGluY29tcGxldGUKLQkJCQlxdWVyeSBn
cmFwaCAqLworCQkJCXF1ZXJ5IGdyYXBoLCBvciBOVUxMIGZvciBkdW1teSBncmFwaCAqLwogCXRy
eF90KgkJdHJ4LAkvKiE8IGluOiB0cmFuc2FjdGlvbiBoYW5kbGUgKi8KIAltZW1faGVhcF90Kglo
ZWFwKQkvKiE8IGluOiBtZW1vcnkgaGVhcCBmcm9tIHdoaWNoIGFsbG9jYXRlZCAqLwogewpAQCAt
MjI2Niw3ICsyMjY2LDkgQEAgcGFyc19jb21wbGV0ZV9ncmFwaF9mb3JfZXhlYygKIAogCXRoci0+
Y2hpbGQgPSBub2RlOwogCi0JcXVlX25vZGVfc2V0X3BhcmVudChub2RlLCB0aHIpOworCWlmIChu
b2RlKSB7CisJCXF1ZV9ub2RlX3NldF9wYXJlbnQobm9kZSwgdGhyKTsKKwl9CiAKIAl0cngtPmdy
YXBoID0gTlVMTDsKIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxz
KS4=