From: marko.makela
Date: April 23 2012 7:27am
Subject: bzr push into mysql-trunk branch (marko.makela:3884 to 3886) Bug#13875241
List-Archive: http://lists.mysql.com/commits/143599
X-Bug: 13875241
Message-Id: <201204230727.q3N7RvbL009260@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4ODYgTWFya28gTcOka2Vsw6QJMjAxMi0wNC0yMwogICAgICBCdWcjMTM4NzUyNDEgTk9OREVU
RVJNSU5JU00gSU4gSU5OT0RCLUlOREVYLU9OTElORS5URVNUCiAgICAgIAogICAgICBUaGUgaW5k
ZXggY2FyZGluYWxpdHkgc3RhdGlzdGljcyB3b3VsZCBzb21ldGltZXMgc2hvdyBvbmUgbW9yZSBl
bnRyeQogICAgICBmb3IgdGhlIFBSSU1BUlkgS0VZLCBkZXBlbmRpbmcgb24gd2hldGhlciB0aGUg
cm93IGFmZmVjdGVkIGJ5IHRoZQogICAgICBERUxFVEUgc3RhdGVtZW50IHdhcyBwdXJnZWQuIEFk
anVzdCB0aGUgc3RhdGlzdGljcyBhbmQgcmVzdWx0cy4KICAgICAgCiAgICAgIFJlbW92ZSB0aGUg
Z2VuZXJhdGlvbiBvZiB0aGUgREJVRyB0cmFjZSAoZHMudHJhY2UpLCBhcyBpdCBpcyBubyBsb25n
ZXIKICAgICAgbmVlZGVkLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lu
bm9kYi9yL2lubm9kYi1pbmRleC1vbmxpbmUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3QvaW5ub2RiLWluZGV4LW9ubGluZS50ZXN0CiAzODg1IE1hcmtvIE3DpGtlbMOkCTIw
MTItMDQtMjMKICAgICAgQ29ycmVjdCBhIHR5cG8gaW4gYSBjb21tZW50LgoKICAgIG1vZGlmaWVk
OgogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbWVyZ2UuY2MKIDM4ODQgTWF5YW5rIFBy
YXNhZAkyMDEyLTA0LTIzCiAgICAgIGZpbnhpbmcgdGVzdCBjYXNlIGJ1ZzEyNDI3MjYyIHJlc3Vs
dCBmaWxlLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvYnVnMTI0MjcyNjIucmVz
dWx0Cj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi1p
bmRleC1vbmxpbmUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9k
Yi1pbmRleC1vbmxpbmUucmVzdWx0CXJldmlkOm1heWFuay5wcmFzYWRAb3JhY2xlLmNvbS0yMDEy
MDQyMzA0MTcwNC1hN21vNTB1MGdpMzVnMzczCisrKyBiL215c3FsLXRlc3Qvc3VpdGUvaW5ub2Ri
L3IvaW5ub2RiLWluZGV4LW9ubGluZS5yZXN1bHQJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5j
b20tMjAxMjA0MjMwNzI1NDYtNmlyN3Jhb3ZmOXRqcXp4cwpAQCAtMSw2ICsxLDQgQEAKLVNFVCBH
TE9CQUwgREVCVUc9J2QscXVlcnksZGVidWdfc3luY19leGVjOmk6dDpBLGRzLnRyYWNlJzsKIFNF
VCBERUJVRz0nK2QsZGVidWdfc3luY19hYm9ydF9vbl90aW1lb3V0JzsKLVNFVCBERUJVRz0nZCxx
dWVyeSxkZWJ1Z19zeW5jX2V4ZWM6aTp0OkEsZHMudHJhY2UnOwogY2FsbCBtdHIuYWRkX3N1cHBy
ZXNzaW9uKCJJbm5vREI6IFdhcm5pbmc6IFNtYWxsIGJ1ZmZlciBwb29sIHNpemUiKTsKIGNhbGwg
bXRyLmFkZF9zdXBwcmVzc2lvbigiQ2Fubm90IGZpbmQgaW5kZXggLipjMiBpbiBJbm5vREIgaW5k
ZXggdHJhbnNsYXRpb24gdGFibGUiKTsKIGNhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiRmluZCBp
bmRleCAuKmMyIGluIElubm9EQiBpbmRleCBsaXN0IGJ1dCBub3QgaXRzIE15U1FMIGluZGV4IG51
bWJlciIpOwpAQCAtMjAsNyArMTgsNiBAQCBTRVQgREVCVUdfU1lOQz0nUkVTRVQnOwogU0VUIERF
QlVHX1NZTkM9J3dyaXRlX3Jvd19ub3JlcGxhY2UgU0lHTkFMIGhhdmVfaGFuZGxlIFdBSVRfRk9S
IGdvX2FoZWFkJzsKIElOU0VSVCBJTlRPIHQxIFZBTFVFUygxLDIsMyk7CiBTRVQgREVCVUc9Jytk
LGRlYnVnX3N5bmNfYWJvcnRfb25fdGltZW91dCc7Ci1TRVQgREVCVUc9J2QscXVlcnksZGVidWdf
c3luY19leGVjOmk6dDpBLGRzLnRyYWNlJzsKIFNFVCBERUJVR19TWU5DPSdub3cgV0FJVF9GT1Ig
aGF2ZV9oYW5kbGUnOwogU0VUIGxvY2tfd2FpdF90aW1lb3V0PTE7CiBBTFRFUiBUQUJMRSB0MSBB
REQgVU5JUVVFIElOREVYKGMyKTsKQEAgLTk5LDYgKzk2LDkgQEAgU0VUIFNFU1NJT04gaW5ub2Ri
X2FuYWx5emVfaXNfcGVyc2lzdGVudAogQU5BTFlaRSBUQUJMRSB0MTsKIFRhYmxlCU9wCU1zZ190
eXBlCU1zZ190ZXh0CiB0ZXN0LnQxCWFuYWx5emUJc3RhdHVzCU9LCitVUERBVEUgbXlzcWwuaW5u
b2RiX2luZGV4X3N0YXRzIFNFVCBzdGF0X3ZhbHVlPTUKK1dIRVJFIGRhdGFiYXNlX25hbWU9J3Rl
c3QnIEFORCB0YWJsZV9uYW1lPSd0MScgQU5EIGluZGV4X25hbWU9J1BSSU1BUlknCitBTkQgc3Rh
dF92YWx1ZT02OwogU0VMRUNUICogRlJPTSBteXNxbC5pbm5vZGJfaW5kZXhfc3RhdHM7CiBkYXRh
YmFzZV9uYW1lCXRhYmxlX25hbWUJaW5kZXhfbmFtZQlsYXN0X3VwZGF0ZQlzdGF0X25hbWUJc3Rh
dF92YWx1ZQlzYW1wbGVfc2l6ZQlzdGF0X2Rlc2NyaXB0aW9uCiB0ZXN0CXQxCVBSSU1BUlkJTEFT
VF9VUERBVEUJbl9kaWZmX3BmeDAxCTUJMQljMQoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRl
c3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLWluZGV4LW9ubGluZS50ZXN0JwotLS0gYS9teXNxbC10
ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdAlyZXZpZDptYXlhbmsu
cHJhc2FkQG9yYWNsZS5jb20tMjAxMjA0MjMwNDE3MDQtYTdtbzUwdTBnaTM1ZzM3MworKysgYi9t
eXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC1vbmxpbmUudGVzdAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDQyMzA3MjU0Ni02aXI3cmFvdmY5dGpxenhzCkBA
IC0xLDkgKzEsNyBAQAogLS1zb3VyY2UgaW5jbHVkZS9oYXZlX2lubm9kYi5pbmMKIC0tc291cmNl
IGluY2x1ZGUvaGF2ZV9kZWJ1Z19zeW5jLmluYwogCi1TRVQgR0xPQkFMIERFQlVHPSdkLHF1ZXJ5
LGRlYnVnX3N5bmNfZXhlYzppOnQ6QSxkcy50cmFjZSc7CiBTRVQgREVCVUc9JytkLGRlYnVnX3N5
bmNfYWJvcnRfb25fdGltZW91dCc7Ci1TRVQgREVCVUc9J2QscXVlcnksZGVidWdfc3luY19leGVj
Omk6dDpBLGRzLnRyYWNlJzsKIAogY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJJbm5vREI6IFdh
cm5pbmc6IFNtYWxsIGJ1ZmZlciBwb29sIHNpemUiKTsKICMgVGhlc2Ugd2lsbCBiZSB0cmlnZ2Vy
ZWQgYnkgSU5TRVJUIElOVE8gdDEgVkFMVUVTKDYsMywxKTsKQEAgLTM1LDcgKzMzLDYgQEAgY29u
bmVjdCAoY29uMSxsb2NhbGhvc3Qscm9vdCwsKTsKIGNvbm5lY3Rpb24gY29uMTsKIAogU0VUIERF
QlVHPScrZCxkZWJ1Z19zeW5jX2Fib3J0X29uX3RpbWVvdXQnOwotU0VUIERFQlVHPSdkLHF1ZXJ5
LGRlYnVnX3N5bmNfZXhlYzppOnQ6QSxkcy50cmFjZSc7CiAjIFRoaXMgc2hvdWxkIGJsb2NrIGF0
IHRoZSBlbmQgYmVjYXVzZSBvZiB0aGUgSU5TRVJUIGluIGNvbm5lY3Rpb24gZGVmYXVsdAogIyBp
cyBob2xkaW5nIGEgbWV0YWRhdGEgbG9jay4KIFNFVCBERUJVR19TWU5DPSdub3cgV0FJVF9GT1Ig
aGF2ZV9oYW5kbGUnOwpAQCAtMTI1LDYgKzEyMiwxMCBAQCBJTlNFUlQgSU5UTyB0MSBWQUxVRVMo
NiwzLDEpOwogSU5TRVJUIElOVE8gdDEgVkFMVUVTKDcsNCwyKTsKIFNFVCBTRVNTSU9OIGlubm9k
Yl9hbmFseXplX2lzX3BlcnNpc3RlbnQ9MTsKIEFOQUxZWkUgVEFCTEUgdDE7CisjIFB1cmdlIG1h
eSBvciBtYXkgbm90IGhhdmUgY2xlYW5lZCB1cCB0aGUgREVMRVRFIEZST00gdDEgV0hFUkUgYzE9
NzsKK1VQREFURSBteXNxbC5pbm5vZGJfaW5kZXhfc3RhdHMgU0VUIHN0YXRfdmFsdWU9NQorV0hF
UkUgZGF0YWJhc2VfbmFtZT0ndGVzdCcgQU5EIHRhYmxlX25hbWU9J3QxJyBBTkQgaW5kZXhfbmFt
ZT0nUFJJTUFSWScKK0FORCBzdGF0X3ZhbHVlPTY7CiAtLXJlcGxhY2VfY29sdW1uIDQgTEFTVF9V
UERBVEUKIFNFTEVDVCAqIEZST00gbXlzcWwuaW5ub2RiX2luZGV4X3N0YXRzOwogQ1JFQVRFIFRB
QkxFIHQxX2MyX3N0YXRzIFNFTEVDVCAqIEZST00gbXlzcWwuaW5ub2RiX2luZGV4X3N0YXRzCkBA
IC0xNjAsNiArMTYxLDggQEAgSU5TRVJUIElOVE8gdDEgU0VMRUNUIDUrYzEsYzIsYzMgRlJPTSB0
MQogSU5TRVJUIElOVE8gdDEgU0VMRUNUIDEwK2MxLGMyLGMzIEZST00gdDE7CiBJTlNFUlQgSU5U
TyB0MSBTRUxFQ1QgMjArYzEsYzIsYzMgRlJPTSB0MTsKIElOU0VSVCBJTlRPIHQxIFNFTEVDVCA0
MCtjMSxjMixjMyBGUk9NIHQxOworIyBQdXJnZSBtYXkgb3IgbWF5IG5vdCBoYXZlIGNsZWFuZWQg
dXAgdGhlIERFTEVURSBGUk9NIHQxIFdIRVJFIGMxPTc7CistLXJlcGxhY2VfcmVzdWx0IDYgNQog
RVhQTEFJTiBTRUxFQ1QgQ09VTlQoKikgRlJPTSB0MSBXSEVSRSBjMj4zOwogQU5BTFlaRSBUQUJM
RSB0MTsKIAoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJn
ZS5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG1lcmdlLmNjCXJldmlkOm1heWFu
ay5wcmFzYWRAb3JhY2xlLmNvbS0yMDEyMDQyMzA0MTcwNC1hN21vNTB1MGdpMzVnMzczCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBtZXJnZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDQyMzA3MjU0Ni02aXI3cmFvdmY5dGpxenhzCkBAIC0yNDczLDcgKzI0NzMs
NyBAQCByb3dfbWVyZ2VfZHJvcF9pbmRleF9kaWN0KAogCWlmIChlcnJvciAhPSBEQl9TVUNDRVNT
KSB7CiAJCS8qIEV2ZW4gdGhvdWdoIHdlIGVuc3VyZSB0aGF0IERETCB0cmFuc2FjdGlvbnMgYXJl
IFdBSVQKIAkJYW5kIERFQURMT0NLIGZyZWUsIHdlIGNvdWxkIGVuY291bnRlciBvdGhlciBlcnJv
cnMgZS5nLiwKLQkJREJfVE9PX01BTllfVFJBTlNBQ1RJT05TLiAqLworCQlEQl9UT09fTUFOWV9D
T05DVVJSRU5UX1RSWFMuICovCiAJCXRyeC0+ZXJyb3Jfc3RhdGUgPSBEQl9TVUNDRVNTOwogCiAJ
CXV0X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOwpAQCAtMjU0NSw3ICsyNTQ1LDcgQEAgcm93X21l
cmdlX2Ryb3BfaW5kZXhlc19kaWN0KAogCWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7CiAJCS8q
IEV2ZW4gdGhvdWdoIHdlIGVuc3VyZSB0aGF0IERETCB0cmFuc2FjdGlvbnMgYXJlIFdBSVQKIAkJ
YW5kIERFQURMT0NLIGZyZWUsIHdlIGNvdWxkIGVuY291bnRlciBvdGhlciBlcnJvcnMgZS5nLiwK
LQkJREJfVE9PX01BTllfVFJBTlNBQ1RJT05TLiAqLworCQlEQl9UT09fTUFOWV9DT05DVVJSRU5U
X1RSWFMuICovCiAJCXRyeC0+ZXJyb3Jfc3RhdGUgPSBEQl9TVUNDRVNTOwogCiAJCXV0X3ByaW50
X3RpbWVzdGFtcChzdGRlcnIpOwpAQCAtMjczOSw3ICsyNzM5LDcgQEAgcm93X21lcmdlX2Ryb3Bf
dGVtcF9pbmRleGVzKHZvaWQpCiAJaWYgKGVycm9yICE9IERCX1NVQ0NFU1MpIHsKIAkJLyogRXZl
biB0aG91Z2ggd2UgZW5zdXJlIHRoYXQgRERMIHRyYW5zYWN0aW9ucyBhcmUgV0FJVAogCQlhbmQg
REVBRExPQ0sgZnJlZSwgd2UgY291bGQgZW5jb3VudGVyIG90aGVyIGVycm9ycyBlLmcuLAotCQlE
Ql9UT09fTUFOWV9UUkFOU0FDVElPTlMuICovCisJCURCX1RPT19NQU5ZX0NPTkNVUlJFTlRfVFJY
Uy4gKi8KIAkJdHJ4LT5lcnJvcl9zdGF0ZSA9IERCX1NVQ0NFU1M7CiAKIAkJdXRfcHJpbnRfdGlt
ZXN0YW1wKHN0ZGVycik7CkBAIC0yODcxLDcgKzI4NzEsNyBAQCByb3dfbWVyZ2VfcmVuYW1lX2lu
ZGV4X3RvX2FkZCgKIAlpZiAoZXJyICE9IERCX1NVQ0NFU1MpIHsKIAkJLyogRXZlbiB0aG91Z2gg
d2UgZW5zdXJlIHRoYXQgRERMIHRyYW5zYWN0aW9ucyBhcmUgV0FJVAogCQlhbmQgREVBRExPQ0sg
ZnJlZSwgd2UgY291bGQgZW5jb3VudGVyIG90aGVyIGVycm9ycyBlLmcuLAotCQlEQl9UT09fTUFO
WV9UUkFOU0FDVElPTlMuICovCisJCURCX1RPT19NQU5ZX0NPTkNVUlJFTlRfVFJYUy4gKi8KIAkJ
dHJ4LT5lcnJvcl9zdGF0ZSA9IERCX1NVQ0NFU1M7CiAKIAkJdXRfcHJpbnRfdGltZXN0YW1wKHN0
ZGVycik7CkBAIC0yOTI2LDcgKzI5MjYsNyBAQCByb3dfbWVyZ2VfcmVuYW1lX2luZGV4X3RvX2Ry
b3AoCiAJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CiAJCS8qIEV2ZW4gdGhvdWdoIHdlIGVuc3Vy
ZSB0aGF0IERETCB0cmFuc2FjdGlvbnMgYXJlIFdBSVQKIAkJYW5kIERFQURMT0NLIGZyZWUsIHdl
IGNvdWxkIGVuY291bnRlciBvdGhlciBlcnJvcnMgZS5nLiwKLQkJREJfVE9PX01BTllfVFJBTlNB
Q1RJT05TLiAqLworCQlEQl9UT09fTUFOWV9DT05DVVJSRU5UX1RSWFMuICovCiAJCXRyeC0+ZXJy
b3Jfc3RhdGUgPSBEQl9TVUNDRVNTOwogCiAJCXV0X3ByaW50X3RpbWVzdGFtcChzdGRlcnIpOwoK
Tm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=