From: marko.makela
Date: February 7 2012 2:36pm
Subject: bzr push into mysql-trunk-wl5534-stage branch (marko.makela:3824 to 3826)
List-Archive: http://lists.mysql.com/commits/142781
Message-Id: <201202071436.q17Eahsx017993@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MjYgTWFya28gTcOka2Vsw6QJMjAxMi0wMi0wNwogICAgICBOb24tZnVuY3Rpb25hbCBjaGFu
Z2VzOgogICAgICAKICAgICAgYnRyX2N1cl9kZWxfbWFya19zZXRfY2x1c3RfcmVjX2xvZygpLCBi
dHJfY3VyX2RlbF9tYXJrX3NldF9jbHVzdF9yZWMoKToKICAgICAgUmVtb3ZlIGNvbnN0YW50IHBh
cmFtZXRlcnMgZmxhZ3M9QlRSX05PX0xPQ0tJTkdfRkxBRywgdmFsPVRSVUUuCiAgICAgIFRoZSBy
ZWRvIGxvZyBhcHBseSAoYnRyX2N1cl9wYXJzZV9kZWxfbWFya19zZXRfY2x1c3RfcmVjKSBpcyBv
bmx5CiAgICAgIGludGVyZXN0ZWQgaW4gQlRSX0tFRVBfU1lTX0ZMQUcsIHdoaWNoIHdhcyBuZXZl
ciBzZXQuCiAgICAgIAogICAgICBBcHByb3ZlZCBieSBKaW1teSBZYW5nIG9uIElNLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCiAgICAgIHN0b3Jh
Z2UvaW5ub2Jhc2UvaW5jbHVkZS9idHIwY3VyLmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHVwZC5jYwogMzgyNSBNYXJrbyBNw6RrZWzDpAkyMDEyLTAyLTA3CiAgICAgIE5vbi1mdW5j
dGlvbmFsIGNoYW5nZTogU2ltcGxpZnkgYXNzZXJ0aW9ucy4KICAgICAgCiAgICAgIHJvd19pbnNf
ZHVwbGljYXRlX2Vycm9yX2luX2NsdXN0KCkgaXMgb25seSBjYWxsZWQgZnJvbSBvbmUgcGxhY2Us
CiAgICAgIGFuZCBhbHdheXMgb24gdGhlIGNsdXN0ZXJlZCBpbmRleC4gUmVwbGFjZSB1dF9hKCkg
d2l0aCB1dF9hZCgpIG9yIHV0X2Vycm9yLgogICAgICAKICAgICAgQXBwcm92ZWQgYnkgSmltbXkg
WWFuZyBvbiBJTS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGlucy5jYwogMzgyNCBNYXJrbyBNw6RrZWzDpAkyMDEyLTAyLTA2CiAgICAgIFdMIzU1MjYgbm9u
LWZ1bmN0aW9uYWwgY2xlYW4tdXAgYWZ0ZXIgcmV2aWV3IGNvbW1lbnRzIGZyb20gU3VubnkgQmFp
bnMKICAgICAgCiAgICAgIGRpY3RfdGFibGVfY2xvc2UoKTogRGV0ZXJtaW5lIGlmIGluZGV4ZXMg
Y2FuIGJlIGRyb3BwZWQgb25seSBpZiAhZGljdF9sb2NrZWQuCiAgICAgIAogICAgICBkaWN0X3Rh
YmxlX2NoZWNrX2Zvcl9kdXBfaW5kZXhlcygpOiBSZW1vdmUgYSBnb3RvIGxhYmVsLgogICAgICAK
ICAgICAgb25saW5lX3JldHJ5X2Ryb3BfaW5kZXhlc193aXRoX3RyeCgpOiBOZXcgZnVuY3Rpb24s
IGZvciByZXVzaW5nIGEKICAgICAgdHJhbnNhY3Rpb24gb2JqZWN0IGZvciBkcm9wcGluZyBpbmNv
bXBsZXRlIGluZGV4ZXMuCiAgICAgIAogICAgICByb3dfbG9nX29ubGluZV9vcCgpLCByb3dfbG9n
X2FwcGx5X29wKCk6IFJlcGxhY2UgNiB3aXRoIERBVEFfVFJYX0lEX0xFTi4KCiAgICBtb2RpZmll
ZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwZGljdC5jYwogICAgICBzdG9yYWdl
L2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwogICAgICBzdG9yYWdlL2lubm9iYXNl
L3Jvdy9yb3cwbG9nLmNjCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2J0ci9i
dHIwY3VyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmNjCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjA2MDkwNzE2LWx6OW1ud3F2eDk0YnpuYjEKKysr
IGIvc3RvcmFnZS9pbm5vYmFzZS9idHIvYnRyMGN1ci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3Jh
Y2xlLmNvbS0yMDEyMDIwNzE0MzU0My1zaWF5MjBxaWN1Zm9qeGFwCkBAIC0yNjA2LDE3ICsyNjA2
LDEzIEBAIFVOSVZfSU5MSU5FCiB2b2lkCiBidHJfY3VyX2RlbF9tYXJrX3NldF9jbHVzdF9yZWNf
bG9nKAogLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQl1bGludAkJZmxhZ3Ms
CS8qITwgaW46IGZsYWdzICovCiAJcmVjX3QqCQlyZWMsCS8qITwgaW46IHJlY29yZCAqLwogCWRp
Y3RfaW5kZXhfdCoJaW5kZXgsCS8qITwgaW46IGluZGV4IG9mIHRoZSByZWNvcmQgKi8KLQlpYm9v
bAkJdmFsLAkvKiE8IGluOiB2YWx1ZSB0byBzZXQgKi8KIAl0cnhfaWRfdAl0cnhfaWQsCS8qITwg
aW46IHRyYW5zYWN0aW9uIGlkICovCiAJcm9sbF9wdHJfdAlyb2xsX3B0ciwvKiE8IGluOiByb2xs
IHB0ciB0byB0aGUgdW5kbyBsb2cgcmVjb3JkICovCiAJbXRyX3QqCQltdHIpCS8qITwgaW46IG10
ciAqLwogewogCWJ5dGUqCWxvZ19wdHI7Ci0JdXRfYWQoZmxhZ3MgPCAyNTYpOwotCXV0X2FkKHZh
bCA8PSAxKTsKIAogCXV0X2FkKCEhcGFnZV9yZWNfaXNfY29tcChyZWMpID09IGRpY3RfdGFibGVf
aXNfY29tcChpbmRleC0+dGFibGUpKTsKIApAQCAtMjYzMiwxMCArMjYyOCw4IEBAIGJ0cl9jdXJf
ZGVsX21hcmtfc2V0X2NsdXN0X3JlY19sb2coCiAJCXJldHVybjsKIAl9CiAKLQltYWNoX3dyaXRl
X3RvXzEobG9nX3B0ciwgZmxhZ3MpOwotCWxvZ19wdHIrKzsKLQltYWNoX3dyaXRlX3RvXzEobG9n
X3B0ciwgdmFsKTsKLQlsb2dfcHRyKys7CisJKmxvZ19wdHIrKyA9IDA7CisJKmxvZ19wdHIrKyA9
IDE7CiAKIAlsb2dfcHRyID0gcm93X3VwZF93cml0ZV9zeXNfdmFsc190b19sb2coCiAJCWluZGV4
LCB0cnhfaWQsIHJvbGxfcHRyLCBsb2dfcHRyLCBtdHIpOwpAQCAtMjczOCwxMiArMjczMiwxMCBA
QCBVTklWX0lOVEVSTgogdWxpbnQKIGJ0cl9jdXJfZGVsX21hcmtfc2V0X2NsdXN0X3JlYygKIC8q
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ki8KLQl1bGludAkJZmxhZ3MsCS8qITwgaW46IHVu
ZG8gbG9nZ2luZyBhbmQgbG9ja2luZyBmbGFncyAqLwogCWJ1Zl9ibG9ja190KglibG9jaywJLyoh
PCBpbi9vdXQ6IGJ1ZmZlciBibG9jayBvZiB0aGUgcmVjb3JkICovCiAJcmVjX3QqCQlyZWMsCS8q
ITwgaW4vb3V0OiByZWNvcmQgKi8KIAlkaWN0X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVz
dGVyZWQgaW5kZXggb2YgdGhlIHJlY29yZCAqLwogCWNvbnN0IHVsaW50KglvZmZzZXRzLC8qITwg
aW46IHJlY19nZXRfb2Zmc2V0cyhyZWMpICovCi0JaWJvb2wJCXZhbCwJLyohPCBpbjogdmFsdWUg
dG8gc2V0ICovCiAJcXVlX3Rocl90Kgl0aHIsCS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLwogCW10
cl90KgkJbXRyKQkvKiE8IGluOiBtdHIgKi8KIHsKQEAgLTI3NjgsNyArMjc2MCw3IEBAIGJ0cl9j
dXJfZGVsX21hcmtfc2V0X2NsdXN0X3JlYygKIAl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGlu
ZGV4KSk7CiAJdXRfYWQoIXJlY19nZXRfZGVsZXRlZF9mbGFnKHJlYywgcmVjX29mZnNfY29tcChv
ZmZzZXRzKSkpOwogCi0JZXJyID0gbG9ja19jbHVzdF9yZWNfbW9kaWZ5X2NoZWNrX2FuZF9sb2Nr
KGZsYWdzLCBibG9jaywKKwllcnIgPSBsb2NrX2NsdXN0X3JlY19tb2RpZnlfY2hlY2tfYW5kX2xv
Y2soQlRSX05PX0xPQ0tJTkdfRkxBRywgYmxvY2ssCiAJCQkJCQkgICByZWMsIGluZGV4LCBvZmZz
ZXRzLCB0aHIpOwogCiAJaWYgKGVyciAhPSBEQl9TVUNDRVNTKSB7CkBAIC0yNzc2LDcgKzI3Njgs
NyBAQCBidHJfY3VyX2RlbF9tYXJrX3NldF9jbHVzdF9yZWMoCiAJCXJldHVybihlcnIpOwogCX0K
IAotCWVyciA9IHRyeF91bmRvX3JlcG9ydF9yb3dfb3BlcmF0aW9uKGZsYWdzLCBUUlhfVU5ET19N
T0RJRllfT1AsIHRociwKKwllcnIgPSB0cnhfdW5kb19yZXBvcnRfcm93X29wZXJhdGlvbigwLCBU
UlhfVU5ET19NT0RJRllfT1AsIHRociwKIAkJCQkJICAgIGluZGV4LCBOVUxMLCBOVUxMLCAwLCBy
ZWMsCiAJCQkJCSAgICAmcm9sbF9wdHIpOwogCWlmIChlcnIgIT0gREJfU1VDQ0VTUykgewpAQCAt
Mjc5MCwxNyArMjc4MiwxNCBAQCBidHJfY3VyX2RlbF9tYXJrX3NldF9jbHVzdF9yZWMoCiAKIAlw
YWdlX3ppcCA9IGJ1Zl9ibG9ja19nZXRfcGFnZV96aXAoYmxvY2spOwogCi0JYnRyX2Jsb2JfZGJn
X3NldF9kZWxldGVkX2ZsYWcocmVjLCBpbmRleCwgb2Zmc2V0cywgdmFsKTsKLQlidHJfcmVjX3Nl
dF9kZWxldGVkX2ZsYWcocmVjLCBwYWdlX3ppcCwgdmFsKTsKKwlidHJfYmxvYl9kYmdfc2V0X2Rl
bGV0ZWRfZmxhZyhyZWMsIGluZGV4LCBvZmZzZXRzLCBUUlVFKTsKKwlidHJfcmVjX3NldF9kZWxl
dGVkX2ZsYWcocmVjLCBwYWdlX3ppcCwgVFJVRSk7CiAKIAl0cnggPSB0aHJfZ2V0X3RyeCh0aHIp
OwogCi0JaWYgKCEoZmxhZ3MgJiBCVFJfS0VFUF9TWVNfRkxBRykpIHsKLQkJcm93X3VwZF9yZWNf
c3lzX2ZpZWxkcyhyZWMsIHBhZ2VfemlwLAotCQkJCSAgICAgICBpbmRleCwgb2Zmc2V0cywgdHJ4
LCByb2xsX3B0cik7Ci0JfQorCXJvd191cGRfcmVjX3N5c19maWVsZHMocmVjLCBwYWdlX3ppcCwg
aW5kZXgsIG9mZnNldHMsIHRyeCwgcm9sbF9wdHIpOwogCi0JYnRyX2N1cl9kZWxfbWFya19zZXRf
Y2x1c3RfcmVjX2xvZyhmbGFncywgcmVjLCBpbmRleCwgdmFsLCB0cngtPmlkLAorCWJ0cl9jdXJf
ZGVsX21hcmtfc2V0X2NsdXN0X3JlY19sb2cocmVjLCBpbmRleCwgdHJ4LT5pZCwKIAkJCQkJICAg
cm9sbF9wdHIsIG10cik7CiAKIAlyZXR1cm4oZXJyKTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvYnRyMGN1ci5oJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lu
Y2x1ZGUvYnRyMGN1ci5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwMjA2MDkw
NzE2LWx6OW1ud3F2eDk0YnpuYjEKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2J0cjBj
dXIuaAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwNzE0MzU0My1zaWF5MjBx
aWN1Zm9qeGFwCkBAIC0zNTMsMTIgKzM1MywxMCBAQCBVTklWX0lOVEVSTgogdWxpbnQKIGJ0cl9j
dXJfZGVsX21hcmtfc2V0X2NsdXN0X3JlYygKIC8qPT09PT09PT09PT09PT09PT09PT09PT09PT09
Ki8KLQl1bGludAkJZmxhZ3MsCS8qITwgaW46IHVuZG8gbG9nZ2luZyBhbmQgbG9ja2luZyBmbGFn
cyAqLwogCWJ1Zl9ibG9ja190KglibG9jaywJLyohPCBpbi9vdXQ6IGJ1ZmZlciBibG9jayBvZiB0
aGUgcmVjb3JkICovCiAJcmVjX3QqCQlyZWMsCS8qITwgaW4vb3V0OiByZWNvcmQgKi8KIAlkaWN0
X2luZGV4X3QqCWluZGV4LAkvKiE8IGluOiBjbHVzdGVyZWQgaW5kZXggb2YgdGhlIHJlY29yZCAq
LwogCWNvbnN0IHVsaW50KglvZmZzZXRzLC8qITwgaW46IHJlY19nZXRfb2Zmc2V0cyhyZWMpICov
Ci0JaWJvb2wJCXZhbCwJLyohPCBpbjogdmFsdWUgdG8gc2V0ICovCiAJcXVlX3Rocl90Kgl0aHIs
CS8qITwgaW46IHF1ZXJ5IHRocmVhZCAqLwogCW10cl90KgkJbXRyKQkvKiE8IGluOiBtdHIgKi8K
IAlfX2F0dHJpYnV0ZV9fKChub25udWxsKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9yb3cvcm93MGlucy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGlu
cy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwNjA5MDcxNi1sejltbndx
dng5NGJ6bmIxCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MJcmV2aWQ6bWFy
a28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjAyMDcxNDM1NDMtc2lheTIwcWljdWZvanhhcApAQCAt
MTk1Myw3ICsxOTUzLDcgQEAgcm93X2luc19kdXBsaWNhdGVfZXJyb3JfaW5fY2x1c3QoCiAKIAlV
VF9OT1RfVVNFRChtdHIpOwogCi0JdXRfYShkaWN0X2luZGV4X2lzX2NsdXN0KGN1cnNvci0+aW5k
ZXgpKTsKKwl1dF9hZChkaWN0X2luZGV4X2lzX2NsdXN0KGN1cnNvci0+aW5kZXgpKTsKIAl1dF9h
ZChkaWN0X2luZGV4X2lzX3VuaXF1ZShjdXJzb3ItPmluZGV4KSk7CiAKIAkvKiBOT1RFOiBGb3Ig
dW5pcXVlIG5vbi1jbHVzdGVyZWQgaW5kZXhlcyB0aGVyZSBtYXkgYmUgYW55IG51bWJlcgpAQCAt
MjA2Myw4ICsyMDYzLDggQEAgcm93X2luc19kdXBsaWNhdGVfZXJyb3JfaW5fY2x1c3QoCiAJCQl9
CiAJCX0KIAotCQl1dF9hKCFkaWN0X2luZGV4X2lzX2NsdXN0KGN1cnNvci0+aW5kZXgpKTsKIAkJ
LyogVGhpcyBzaG91bGQgbmV2ZXIgaGFwcGVuICovCisJCXV0X2Vycm9yOwogCX0KIAogCWVyciA9
IERCX1NVQ0NFU1M7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MHVwZC5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHVwZC5jYwlyZXZpZDptYXJr
by5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDIwNjA5MDcxNi1sejltbndxdng5NGJ6bmIxCisrKyBi
L3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzB1cGQuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjAyMDcxNDM1NDMtc2lheTIwcWljdWZvanhhcApAQCAtMjAyMyw4ICsyMDIzLDgg
QEAgcm93X3VwZF9jbHVzdF9yZWNfYnlfaW5zZXJ0KAogCQl1dF9hZChwYWdlX3JlY19pc191c2Vy
X3JlYyhyZWMpKTsKIAogCQllcnIgPSBidHJfY3VyX2RlbF9tYXJrX3NldF9jbHVzdF9yZWMoCi0J
CQlCVFJfTk9fTE9DS0lOR19GTEFHLCBidHJfY3VyX2dldF9ibG9jayhidHJfY3VyKSwKLQkJCXJl
YywgaW5kZXgsIG9mZnNldHMsIFRSVUUsIHRociwgbXRyKTsKKwkJCWJ0cl9jdXJfZ2V0X2Jsb2Nr
KGJ0cl9jdXIpLCByZWMsIGluZGV4LCBvZmZzZXRzLAorCQkJdGhyLCBtdHIpOwogCQlpZiAoZXJy
ICE9IERCX1NVQ0NFU1MpIHsKIGVycl9leGl0OgogCQkJbXRyX2NvbW1pdChtdHIpOwpAQCAtMjI2
MSw4ICsyMjYxLDggQEAgcm93X3VwZF9kZWxfbWFya19jbHVzdF9yZWMoCiAJbG9ja3MsIGJlY2F1
c2Ugd2UgYXNzdW1lIHRoYXQgd2UgaGF2ZSBhbiB4LWxvY2sgb24gdGhlIHJlY29yZCAqLwogCiAJ
ZXJyID0gYnRyX2N1cl9kZWxfbWFya19zZXRfY2x1c3RfcmVjKAotCQlCVFJfTk9fTE9DS0lOR19G
TEFHLCBidHJfY3VyX2dldF9ibG9jayhidHJfY3VyKSwKLQkJYnRyX2N1cl9nZXRfcmVjKGJ0cl9j
dXIpLCBpbmRleCwgb2Zmc2V0cywgVFJVRSwgdGhyLCBtdHIpOworCQlidHJfY3VyX2dldF9ibG9j
ayhidHJfY3VyKSwgYnRyX2N1cl9nZXRfcmVjKGJ0cl9jdXIpLAorCQlpbmRleCwgb2Zmc2V0cywg
dGhyLCBtdHIpOwogCWlmIChlcnIgPT0gREJfU1VDQ0VTUyAmJiByZWZlcmVuY2VkKSB7CiAJCS8q
IE5PVEUgdGhhdCB0aGUgZm9sbG93aW5nIGNhbGwgbG9zZXMgdGhlIHBvc2l0aW9uIG9mIHBjdXIg
ISAqLwogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==