From: marko.makela
Date: May 27 2012 8:12pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3872 to 3873)
List-Archive: http://lists.mysql.com/commits/143972
Message-Id: <201205272012.q4RKCeLC006446@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NzMgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0yNwogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2VzLgogICAgICAKICAgICAgUmVuYW1lIHJvd19sb2dfc3RydWN0IHRvIHJvd19sb2dfdC4gUmVt
b3ZlIGFuIHVubmVjZXNzYXJ5IGNhc3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5u
b2Jhc2UvaW5jbHVkZS9yb3cwdHlwZXMuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
ZnRzb3J0LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKIDM4NzIgTWFy
a28gTcOka2Vsw6QJMjAxMi0wNS0yNwogICAgICBXTCM2MjU1IHByZXBhcmF0aW9uOiBTdXNwZW5k
IHRoZSBwdXJnZSBpZiBpdCB3b3VsZCBmcmVlIEJMT0JzLgogICAgICAKICAgICAgV2UgY2Fubm90
IGZyZWUgQkxPQnMgZHVyaW5nIG9ubGluZSB0YWJsZSByZWJ1aWxkLCBiZWNhdXNlIHdlIGRvIG5v
dCB3cml0ZQogICAgICB0aGUgQkxPQnMgdG8gdGhlIG9ubGluZSBsb2cuIE9ubGluZSBsb2cgYXBw
bHkgYXNzdW1lcyB0aGF0IHRoZSBCTE9CcyBhcmUKICAgICAgYWNjZXNzaWJsZS4KICAgICAgCiAg
ICAgIHJvd19wdXJnZV91cGRfZXhpc3Rfb3JfZXh0ZXJuX2Z1bmMoKSwgcm93X3B1cmdlX3JlY29y
ZF9mdW5jKCk6IFJldHVybiB0cnVlCiAgICAgIGlmIHRoZSByZWNvcmQgd2FzIHB1cmdlZCwgZmFs
c2UgaWYgaXQgd291bGQgZnJlZSBCTE9CcyBvZiBhIHRhYmxlIHRoYXQgaXMKICAgICAgYmVpbmcg
cmVidWlsdCBvbmxpbmUuCiAgICAgIAogICAgICByb3dfcHVyZ2UoKTogSWYgYSByZWNvcmQgaXMg
bm90IHB1cmdlYWJsZSwgcmV0cnkgaW4gMSBzZWNvbmQsIHVudGlsIHRoZQogICAgICBzZXJ2ZXIg
aXMgc2h1dCBkb3duIGlzIGluaXRpYXRlZC4gVE9ETzogbW92ZSB0aGUgcmVjb3JkIGFzaWRlLCBh
bmQgY29udGludWUKICAgICAgd2l0aCB0aGUgcmVzdCBvZiB0aGUgcHVyZ2UuCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzB0eXBlcy5oJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL2luY2x1ZGUvcm93MHR5cGVzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA1MjcxODM0NTUtajN6bDdyMGlhbDc4NjBidQorKysgYi9zdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvcm93MHR5cGVzLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1
MjcyMDEwMDQtd200eGw0emhnbWN6dmJhYwpAQCAtMSw2ICsxLDYgQEAKIC8qKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKgogCi1Db3B5cmlnaHQgKGMpIDE5OTYsIDIwMTAsIE9yYWNsZSBhbmQvb3IgaXRzIGFm
ZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCitDb3B5cmlnaHQgKGMpIDE5OTYsIDIwMTIs
IE9yYWNsZSBhbmQvb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAKIFRo
aXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQv
b3IgbW9kaWZ5IGl0IHVuZGVyCiB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM
aWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZQpAQCAtNjgsNyArNjgsNyBA
QCBlbnVtIHJvd19vcCB7CiB9OwogCiAvKiogQnVmZmVyIGZvciBsb2dnaW5nIG1vZGlmaWNhdGlv
bnMgZHVyaW5nIG9ubGluZSBpbmRleCBjcmVhdGlvbiAqLwotdHlwZWRlZiBzdHJ1Y3Qgcm93X2xv
Z19zdHJ1Y3Qgcm93X2xvZ190Oworc3RydWN0IHJvd19sb2dfdDsKIAogLyogTXlTUUwgZGF0YSB0
eXBlcyAqLwogc3RydWN0IFRBQkxFOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBmdHNvcnQuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBmdHNv
cnQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MjcxODM0NTUtajN6bDdy
MGlhbDc4NjBidQorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwZnRzb3J0LmNjCXJldmlk
Om1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNTI3MjAxMDA0LXdtNHhsNHpoZ21jenZiYWMK
QEAgLTc1Nyw4ICs3NTcsNyBAQCBleGl0OgogCQlpZiAodF9jdHgucm93c19hZGRlZFtpXSkgewog
CQkJcm93X21lcmdlX2J1Zl9zb3J0KGJ1ZltpXSwgTlVMTCk7CiAJCQlyb3dfbWVyZ2VfYnVmX3dy
aXRlKAotCQkJCWJ1ZltpXSwgKGNvbnN0IG1lcmdlX2ZpbGVfdCopIG1lcmdlX2ZpbGVbaV0sCi0J
CQkJYmxvY2tbaV0pOworCQkJCWJ1ZltpXSwgbWVyZ2VfZmlsZVtpXSwgYmxvY2tbaV0pOwogCQkJ
cm93X21lcmdlX3dyaXRlKG1lcmdlX2ZpbGVbaV0tPmZkLAogCQkJCQltZXJnZV9maWxlW2ldLT5v
ZmZzZXQrKywgYmxvY2tbaV0pOwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MGxvZy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwly
ZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUyNzE4MzQ1NS1qM3psN3IwaWFsNzg2
MGJ1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MJcmV2aWQ6bWFya28ubWFr
ZWxhQG9yYWNsZS5jb20tMjAxMjA1MjcyMDEwMDQtd200eGw0emhnbWN6dmJhYwpAQCAtNjMsNyAr
NjMsNyBAQCByb3dfbG9nX29ubGluZV9vcCgpIHRvIHRoaXMgYnVmZmVyLgogV2hlbiBoZWFkLmJs
b2NrcyA9PSB0YWlsLmJsb2NrcywgdGhlIHJlYWRlciB3aWxsIGFjY2VzcyB0YWlsLmJsb2NrCiBk
aXJlY3RseS4gV2hlbiBhbHNvIGhlYWQuYnl0ZXMgPT0gdGFpbC5ieXRlcywgYm90aCBjb3VudHMg
d2lsbCBiZQogcmVzZXQgdG8gMCBhbmQgdGhlIGZpbGUgd2lsbCBiZSB0cnVuY2F0ZWQuICovCi1z
dHJ1Y3Qgcm93X2xvZ19zdHJ1Y3Qgeworc3RydWN0IHJvd19sb2dfdCB7CiAJaW50CQlmZDsJLyoh
PCBmaWxlIGRlc2NyaXB0b3IgKi8KIAltdXRleF90CQltdXRleDsJLyohPCBtdXRleCBwcm90ZWN0
aW5nIG1heF90cnggYW5kIHRhaWwgKi8KIAl0cnhfaWRfdAltYXhfdHJ4Oy8qITwgYmlnZ2VzdCBv
YnNlcnZlZCB0cnhfaWQgaW4KCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVt
YWlscyku