From: marko.makela
Date: November 9 2012 1:59pm
Subject: bzr push into mysql-trunk branch (marko.makela:4961 to 4962)
List-Archive: http://lists.mysql.com/commits/145230
Message-Id: <20121109135937.32439.90992.4962@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQ5NjIgTWFya28gTcOka2Vsw6QJMjAxMi0xMS0wOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3NydjBtb24uaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmNj
CiA0OTYxIFZlbmthdGEgU2lkYWdhbQkyMDEyLTExLTA5IFttZXJnZV0KICAgICAgQnVnIzEzNTU2
MDAwOiBDSEVDSyBBTkQgUkVQQUlSIFRBQkxFIFNIT1VMRCBCRSBNT1JFIFJPQlVTVFsyXQogICAg
ICAKICAgICAgTnVsbCBtZXJnZSBmcm9tIDUuNiB0byB0cnVuawoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9zcnYwbW9uLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2UvaW5jbHVkZS9zcnYwbW9uLmgJcmV2aWQ6dmVua2F0YS5zaWRhZ2FtQG9yYWNsZS5jb20tMjAx
MjExMDkxMzU0NTYtaXc0dmhoZWtkNHkwMnBvaQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvc3J2MG1vbi5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIxMTA5MTM1NzQy
LTd4OTdna2x5bnRhc2l0cmgKQEAgLTYyMiw3ICs2MjIsMTcgQEAgVXNlIE1PTklUT1JfREVDIGlm
IGFwcHJvcHJpYXRlIG11dGV4IHBybwogCQl9CQkJCQkJCVwKIAl9CiAKKyNpZmRlZiBVTklWX0RF
QlVHX1ZBTEdSSU5ECisjIGRlZmluZSBNT05JVE9SX0NIRUNLX0RFRklORUQodmFsdWUpIGRvIHsJ
XAorCW1vbl90eXBlX3QgbSA9IHZhbHVlOwkJCVwKKwlVTklWX01FTV9BU1NFUlRfUlcoJm0sIHNp
emVvZiBtKTsJXAorfSB3aGlsZSAoMCkKKyNlbHNlIC8qIFVOSVZfREVCVUdfVkFMR1JJTkQgKi8K
KyMgZGVmaW5lIE1PTklUT1JfQ0hFQ0tfREVGSU5FRCh2YWx1ZSkgKHZvaWQpIDAKKyNlbmRpZiAv
KiBVTklWX0RFQlVHX1ZBTEdSSU5EICovCisKICNkZWZpbmUJTU9OSVRPUl9JTkNfVkFMVUUobW9u
aXRvciwgdmFsdWUpCQkJCVwKKwlNT05JVE9SX0NIRUNLX0RFRklORUQodmFsdWUpOwkJCQkJXAog
CWlmIChNT05JVE9SX0lTX09OKG1vbml0b3IpKSB7CQkJCQlcCiAJCU1PTklUT1JfVkFMVUUobW9u
aXRvcikgKz0gKG1vbl90eXBlX3QpICh2YWx1ZSk7CQlcCiAJCWlmIChNT05JVE9SX1ZBTFVFKG1v
bml0b3IpID4gTU9OSVRPUl9NQVhfVkFMVUUobW9uaXRvcikpIHsgIFwKQEAgLTYzMSw2ICs2NDEs
NyBAQCBVc2UgTU9OSVRPUl9ERUMgaWYgYXBwcm9wcmlhdGUgbXV0ZXggcHJvCiAJfQogCiAjZGVm
aW5lCU1PTklUT1JfREVDX1ZBTFVFKG1vbml0b3IsIHZhbHVlKQkJCQlcCisJTU9OSVRPUl9DSEVD
S19ERUZJTkVEKHZhbHVlKTsJCQkJCVwKIAlpZiAoTU9OSVRPUl9JU19PTihtb25pdG9yKSkgewkJ
CQkJXAogCQl1dF9hZChNT05JVE9SX1ZBTFVFKG1vbml0b3IpID49IChtb25fdHlwZV90KSAodmFs
dWUpOwlcCiAJCU1PTklUT1JfVkFMVUUobW9uaXRvcikgLT0gKG1vbl90eXBlX3QpICh2YWx1ZSk7
CQlcCkBAIC02NTksNiArNjcwLDcgQEAgY291bGQgYWxyZWFkeSBiZSBjaGVja2VkIGFzIGEgbW9k
dWxlIGdybwogCiAvKiogRGlyZWN0bHkgc2V0IGEgbW9uaXRvciBjb3VudGVyJ3MgdmFsdWUgKi8K
ICNkZWZpbmUJTU9OSVRPUl9TRVQobW9uaXRvciwgdmFsdWUpCQkJCQlcCisJTU9OSVRPUl9DSEVD
S19ERUZJTkVEKHZhbHVlKTsJCQkJCVwKIAlpZiAoTU9OSVRPUl9JU19PTihtb25pdG9yKSkgewkJ
CQkJXAogCQlNT05JVE9SX1ZBTFVFKG1vbml0b3IpID0gKG1vbl90eXBlX3QpICh2YWx1ZSk7CQlc
CiAJCWlmIChNT05JVE9SX1ZBTFVFKG1vbml0b3IpID4gTU9OSVRPUl9NQVhfVkFMVUUobW9uaXRv
cikpIHsgIFwKQEAgLTY3MSw5ICs2ODMsMTAgQEAgY291bGQgYWxyZWFkeSBiZSBjaGVja2VkIGFz
IGEgbW9kdWxlIGdybwogCiAvKiogQWRkIHRpbWUgZGlmZmVyZW5jZSBiZXR3ZWVuIG5vdyBhbmQg
aW5wdXQgInZhbHVlIiAoaW4gc2Vjb25kcykgdG8gdGhlCiBtb25pdG9yIGNvdW50ZXIKLUBtb25p
dG9yCW1vbml0b3IgdG8gdXBkYXRlIGZvciB0aGUgdGltZSBkaWZmZXJlbmNlCi1AdmFsdWUJCXRo
ZSBzdGFydCB0aW1lIHZhbHVlICovCitAcGFyYW0gbW9uaXRvcgltb25pdG9yIHRvIHVwZGF0ZSBm
b3IgdGhlIHRpbWUgZGlmZmVyZW5jZQorQHBhcmFtIHZhbHVlCXRoZSBzdGFydCB0aW1lIHZhbHVl
ICovCiAjZGVmaW5lCU1PTklUT1JfSU5DX1RJTUVfSU5fTUlDUk9fU0VDUyhtb25pdG9yLCB2YWx1
ZSkJCQlcCisJTU9OSVRPUl9DSEVDS19ERUZJTkVEKHZhbHVlKTsJCQkJCVwKIAlpZiAoTU9OSVRP
Ul9JU19PTihtb25pdG9yKSkgewkJCQkJXAogCQl1bGxpbnQJb2xkX3RpbWUgPSAodmFsdWUpOwkJ
CQlcCiAJCXZhbHVlID0gdXRfdGltZV91cyhOVUxMKTsJCQkJXApAQCAtNjgzLDE1ICs2OTYsMTYg
QEAgbW9uaXRvciBjb3VudGVyCiAvKiogVGhpcyBtYWNybyB1cGRhdGVzIDMgY291bnRlcnMgaW4g
b25lIGNhbGwuIEhvd2V2ZXIsIGl0IG9ubHkgY2hlY2tzIHRoZQogbWFpbi9maXJzdCBtb25pdG9y
IGNvdW50ZXIgJ21vbml0b3InLCB0byBzZWUgaXQgaXMgb24gb3Igb2ZmIHRvIGRlY2lkZQogd2hl
dGhlciB0byBkbyB0aGUgdXBkYXRlLgotQG1vbml0b3IJCXRoZSBtYWluIG1vbml0b3IgY291bnRl
ciB0byB1cGRhdGUuIEl0IGFjY291bnRzIGZvcgorQHBhcmFtIG1vbml0b3IJCXRoZSBtYWluIG1v
bml0b3IgY291bnRlciB0byB1cGRhdGUuIEl0IGFjY291bnRzIGZvcgogCQkJdGhlIGFjY3VtdWxh
dGl2ZSB2YWx1ZSBmb3IgdGhlIGNvdW50ZXIuCi1AbW9uaXRvcl9uX2NhbGxzCWNvdW50ZXIgdGhh
dCBjb3VudHMgbnVtYmVyIG9mIHRpbWVzIHRoaXMgbWFjcm8gaXMKK0BwYXJhbSBtb25pdG9yX25f
Y2FsbHMJY291bnRlciB0aGF0IGNvdW50cyBudW1iZXIgb2YgdGltZXMgdGhpcyBtYWNybyBpcwog
CQkJY2FsbGVkCi1AbW9uaXRvcl9wZXJfY2FsbAljb3VudGVyIHRoYXQgcmVjb3JkcyB0aGUgY3Vy
cmVudCBhbmQgbWF4IHZhbHVlIG9mCitAcGFyYW0gbW9uaXRvcl9wZXJfY2FsbAljb3VudGVyIHRo
YXQgcmVjb3JkcyB0aGUgY3VycmVudCBhbmQgbWF4IHZhbHVlIG9mCiAJCQllYWNoIGluY3JlbWVu
dGFsIHZhbHVlCi1AdmFsdWUJCQlpbmNyZW1lbnRhbCB2YWx1ZSB0byByZWNvcmQgdGhpcyB0aW1l
ICovCitAcGFyYW0gdmFsdWUJCWluY3JlbWVudGFsIHZhbHVlIHRvIHJlY29yZCB0aGlzIHRpbWUg
Ki8KICNkZWZpbmUgTU9OSVRPUl9JTkNfVkFMVUVfQ1VNVUxBVElWRSgJCQkJCVwKIAkJbW9uaXRv
ciwgbW9uaXRvcl9uX2NhbGxzLCBtb25pdG9yX3Blcl9jYWxsLCB2YWx1ZSkJXAorCU1PTklUT1Jf
Q0hFQ0tfREVGSU5FRCh2YWx1ZSk7CQkJCQlcCiAJaWYgKE1PTklUT1JfSVNfT04obW9uaXRvcikp
IHsJCQkJCVwKIAkJTU9OSVRPUl9WQUxVRShtb25pdG9yX25fY2FsbHMpKys7CQkJXAogCQlNT05J
VE9SX1ZBTFVFKG1vbml0b3JfcGVyX2NhbGwpID0gKG1vbl90eXBlX3QpICh2YWx1ZSk7CVwKQEAg
LTcwOSw2ICs3MjMsNyBAQCB3aGV0aGVyIHRvIGRvIHRoZSB1cGRhdGUuCiAvKiogRGlyZWN0bHkg
c2V0IGEgbW9uaXRvciBjb3VudGVyJ3MgdmFsdWUsIGFuZCBpZiB0aGUgdmFsdWUKIGlzIG1vbm90
b25pY2FsbHkgaW5jcmVhc2luZywgb25seSBtYXggdmFsdWUgbmVlZHMgdG8gYmUgdXBkYXRlZCAq
LwogI2RlZmluZQlNT05JVE9SX1NFVF9VUERfTUFYX09OTFkobW9uaXRvciwgdmFsdWUpCQkJXAor
CU1PTklUT1JfQ0hFQ0tfREVGSU5FRCh2YWx1ZSk7CQkJCQlcCiAJaWYgKE1PTklUT1JfSVNfT04o
bW9uaXRvcikpIHsJCQkJCVwKIAkJTU9OSVRPUl9WQUxVRShtb25pdG9yKSA9IChtb25fdHlwZV90
KSAodmFsdWUpOwkJXAogCQlpZiAoTU9OSVRPUl9WQUxVRShtb25pdG9yKSA+IE1PTklUT1JfTUFY
X1ZBTFVFKG1vbml0b3IpKSB7ICBcCkBAIC03MTksNiArNzM0LDcgQEAgaXMgbW9ub3RvbmljYWxs
eSBpbmNyZWFzaW5nLCBvbmx5IG1heCB2YQogLyoqIFNvbWUgdmFsdWVzIHN1Y2ggYXMgbG9nIHNl
cXVlbmNlIG51bWJlciBhcmUgbW9udG9taWNhbGx5IGluY3JlYXNpbmcKIG51bWJlciwgZG8gbm90
IG5lZWQgdG8gcmVjb3JkIG1heC9taW4gdmFsdWVzICovCiAjZGVmaW5lIE1PTklUT1JfU0VUX1NJ
TVBMRShtb25pdG9yLCB2YWx1ZSkJCQkJXAorCU1PTklUT1JfQ0hFQ0tfREVGSU5FRCh2YWx1ZSk7
CQkJCQlcCiAJaWYgKE1PTklUT1JfSVNfT04obW9uaXRvcikpIHsJCQkJCVwKIAkJTU9OSVRPUl9W
QUxVRShtb25pdG9yKSA9IChtb25fdHlwZV90KSAodmFsdWUpOwkJXAogCX0KQEAgLTc0Nyw5ICs3
NjMsMTEgQEAgY29uc29saWRhdGUgaW5mb3JtYXRpb24gZnJvbSBleGlzdGluZyBzeQogCiAvKiog
U2F2ZSB0aGUgcGFzc2VkLWluIHZhbHVlIHRvIG1vbl9zdGFydF92YWx1ZSBmaWVsZCBvZiBtb25p
dG9yCiBjb3VudGVycyAqLwotI2RlZmluZSBNT05JVE9SX1NBVkVfU1RBUlQobW9uaXRvciwgdmFs
dWUpCQkJCVwKKyNkZWZpbmUgTU9OSVRPUl9TQVZFX1NUQVJUKG1vbml0b3IsIHZhbHVlKSBkbyB7
CQkJCVwKKwlNT05JVE9SX0NIRUNLX0RFRklORUQodmFsdWUpOwkJCQkJXAogCShNT05JVE9SX1NU
QVJUX1ZBTFVFKG1vbml0b3IpID0JCQkJCVwKLQkJIChtb25fdHlwZV90KSAodmFsdWUpIC0gTU9O
SVRPUl9WQUxVRV9SRVNFVChtb25pdG9yKSkKKwkJKG1vbl90eXBlX3QpICh2YWx1ZSkgLSBNT05J
VE9SX1ZBTFVFX1JFU0VUKG1vbml0b3IpKTsJXAorCX0gd2hpbGUgKDApCiAKIC8qKiBTYXZlIHRo
ZSBwYXNzZWQtaW4gdmFsdWUgdG8gbW9uX2xhc3RfdmFsdWUgZmllbGQgb2YgbW9uaXRvcgogY291
bnRlcnMgKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9n
LmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2xvZy9sb2cwbG9nLmNjCXJldmlkOnZlbmthdGEu
c2lkYWdhbUBvcmFjbGUuY29tLTIwMTIxMTA5MTM1NDU2LWl3NHZoaGVrZDR5MDJwb2kKKysrIGIv
c3RvcmFnZS9pbm5vYmFzZS9sb2cvbG9nMGxvZy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEyMTEwOTEzNTc0Mi03eDk3Z2tseW50YXNpdHJoCkBAIC03NDcsOSArNzQ3LDYgQEAg
bG9nX2luaXQodm9pZCkKIAogCWxvZ19zeXMtPmxzbiA9IExPR19TVEFSVF9MU047CiAKLQlNT05J
VE9SX1NFVChNT05JVE9SX0xTTl9DSEVDS1BPSU5UX0FHRSwKLQkJICAgIGxvZ19zeXMtPmxzbiAt
IGxvZ19zeXMtPmxhc3RfY2hlY2twb2ludF9sc24pOwotCiAJdXRfYShMT0dfQlVGRkVSX1NJWkUg
Pj0gMTYgKiBPU19GSUxFX0xPR19CTE9DS19TSVpFKTsKIAl1dF9hKExPR19CVUZGRVJfU0laRSA+
PSA0ICogVU5JVl9QQUdFX1NJWkUpOwogCkBAIC03OTUsNyArNzkyLDYgQEAgbG9nX2luaXQodm9p
ZCkKIAogCWxvZ19zeXMtPm5leHRfY2hlY2twb2ludF9ubyA9IDA7CiAJbG9nX3N5cy0+bGFzdF9j
aGVja3BvaW50X2xzbiA9IGxvZ19zeXMtPmxzbjsKLQlNT05JVE9SX1NFVChNT05JVE9SX0xTTl9D
SEVDS1BPSU5UX0FHRSwgMCk7CiAJbG9nX3N5cy0+bl9wZW5kaW5nX2NoZWNrcG9pbnRfd3JpdGVz
ID0gMDsKIAogCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==