From: marko.makela
Date: September 26 2011 7:30am
Subject: bzr push into mysql-5.1 branch (marko.makela:3613 to 3614) Bug#12963823
List-Archive: http://lists.mysql.com/commits/141133
X-Bug: 12963823
Message-Id: <201109260730.p8Q7UDXQ016869@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MTQgTWFya28gTcOka2Vsw6QJMjAxMS0wOS0yMgogICAgICBCdWcjMTI5NjM4MjMgQ1JBU0gg
SU4gUFVSR0UgVEhSRUFEIFVOREVSIFVOVVNVQUwgQ0lSQ1VNU1RBTkNFUwogICAgICAKICAgICAg
UmVwbGFjZSBwYXJ0IG9mIHRoZSBwYXRjaCB0aGF0IEtldmluIGFwcGFyZW50bHkgZm9yZ290IHRv
IHB1c2guCiAgICAgIEZpeCB0aGUgYnVnIGFsc28gaW4gdGhlIGJ1aWx0LWluIElubm9EQiBvZiBN
eVNRTCA1LjEuCiAgICAgIAogICAgICBJIGNhbm5vdCBleHBsYWluIHdoeSB0aGUgdGVzdCBjYXNl
IHdhcyBub3QgZmFpbGluZyB3aXRob3V0IHRoZQogICAgICBmdWxsIHBhdGNoLgogICAgICAKICAg
ICAgVGhpcyB3YXMgcmI6NzYyLCBhcHByb3ZlZCBieSBtZS4KCiAgICBtb2RpZmllZDoKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdlLmMKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1
Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBwdXJnZS5j
CiAzNjEzIGtldmluLmxld2lzQG9yYWNsZS5jb20JMjAxMS0wOS0yMAogICAgICBCdWcgMTI5NjM4
MjMgLSBDcmFzaCBpbiBQdXJnZSB0aHJlYWQgdW5kZXIgdW51c3VhbCBjaXJjdW1zdGFuY2VzLgog
ICAgICBUaGUgcHJvYmxlbSBvY2N1cnJlZCB3aGVuIGluZGV4ZXMgYXJlIGFkZGVkIGJldHdlZW4g
dGhlIHRpbWUgdGhhdCBhbgogICAgICBVTkRPIHJlY29yZCBpcyBjcmVhdGVkIGFuZCB0aGUgdGlt
ZSB0aGF0IHRoZSBwdXJnZSB0aHJlYWQgY29tZXMgYXJvdW5kCiAgICAgIGFuZCBkZWxldGVzIHRo
ZSBvbGQgc2Vjb25kYXJ5IGluZGV4IGVudHJpZXMuICBUaGUgcHVyZ2UgdGhyZWFkIHdvdWxkCiAg
ICAgIGhpdCBhbiBhc3NlcnQgd2hlbiB0cnlpbmcgdG8gYnVpbGQgYSBzZWNvbmRhcnkgaW5kZXgg
ZW50cnkgZm9yCiAgICAgIHNlYXJjaGluZy4gIFRoZSBwcm9ibGVtIHdhcyB0aGF0IHRoZSBvbGQg
dmFsdWUgb2YgdGhvc2UgZmllbGRzIHdlcmUgbm90CiAgICAgIGluIHRoZSBVTkRPIHJlY29yZCBz
aW5jZSB0aGV5IHdlcmUgbm90IHBhcnQgb2YgYW4gaW5kZXggd2hlbiB0aGUgVVBEQVRFCiAgICAg
IG9jY3VyZWQuIAogICAgICBBIHRlc3QgY2FzZSB3YXMgYWRkZWQgdG8gaW5ub2RiLWluZGV4LnRl
c3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9y
L2lubm9kYi1pbmRleC5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2lu
L3QvaW5ub2RiLWluZGV4LnRlc3QKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cw
cHVyZ2UuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHB1cmdl
LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBwdXJnZS5jCXJldmlkOmtldmluLmxl
d2lzQG9yYWNsZS5jb20tMjAxMTA5MjEwMDEyMzYtbGo1dHhqajV3bnpjdmR6OQorKysgYi9zdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwcHVyZ2UuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDkyMjEwMzUwMi1uOTExYTc5bnhpaTZ5ZDM2CkBAIC0zNzksNyArMzc5LDggQEAgcm93
X3B1cmdlX3VwZF9leGlzdF9vcl9leHRlcm4oCiAKIAl1dF9hZChub2RlKTsKIAotCWlmIChub2Rl
LT5yZWNfdHlwZSA9PSBUUlhfVU5ET19VUERfREVMX1JFQykgeworCWlmIChub2RlLT5yZWNfdHlw
ZSA9PSBUUlhfVU5ET19VUERfREVMX1JFQworCSAgICB8fCAobm9kZS0+Y21wbF9pbmZvICYgVVBE
X05PREVfTk9fT1JEX0NIQU5HRSkpIHsKIAogCQlnb3RvIHNraXBfc2Vjb25kYXJpZXM7CiAJfQpA
QCAtNDg4LDE0ICs0ODksMTQgQEAgcm93X3B1cmdlX3BhcnNlX3VuZG9fcmVjKAogCWR1bGludAkJ
cm9sbF9wdHI7CiAJdWxpbnQJCWluZm9fYml0czsKIAl1bGludAkJdHlwZTsKLQl1bGludAkJY21w
bF9pbmZvOwogCiAJdXRfYWQobm9kZSAmJiB0aHIpOwogCiAJdHJ4ID0gdGhyX2dldF90cngodGhy
KTsKIAotCXB0ciA9IHRyeF91bmRvX3JlY19nZXRfcGFycyhub2RlLT51bmRvX3JlYywgJnR5cGUs
ICZjbXBsX2luZm8sCi0JCQkJICAgIHVwZGF0ZWRfZXh0ZXJuLCAmdW5kb19ubywgJnRhYmxlX2lk
KTsKKwlwdHIgPSB0cnhfdW5kb19yZWNfZ2V0X3BhcnMoCisJCW5vZGUtPnVuZG9fcmVjLCAmdHlw
ZSwgJm5vZGUtPmNtcGxfaW5mbywKKwkJdXBkYXRlZF9leHRlcm4sICZ1bmRvX25vLCAmdGFibGVf
aWQpOwogCW5vZGUtPnJlY190eXBlID0gdHlwZTsKIAogCWlmICh0eXBlID09IFRSWF9VTkRPX1VQ
RF9ERUxfUkVDICYmICEoKnVwZGF0ZWRfZXh0ZXJuKSkgewpAQCAtNTA4LDcgKzUwOSw4IEBAIHJv
d19wdXJnZV9wYXJzZV91bmRvX3JlYygKIAlub2RlLT50YWJsZSA9IE5VTEw7CiAKIAlpZiAodHlw
ZSA9PSBUUlhfVU5ET19VUERfRVhJU1RfUkVDCi0JICAgICYmIGNtcGxfaW5mbyAmIFVQRF9OT0RF
X05PX09SRF9DSEFOR0UgJiYgISgqdXBkYXRlZF9leHRlcm4pKSB7CisJICAgICYmIG5vZGUtPmNt
cGxfaW5mbyAmIFVQRF9OT0RFX05PX09SRF9DSEFOR0UKKwkgICAgJiYgISgqdXBkYXRlZF9leHRl
cm4pKSB7CiAKIAkJLyogUHVyZ2UgcmVxdWlyZXMgbm8gY2hhbmdlcyB0byBpbmRleGVzOiB3ZSBt
YXkgcmV0dXJuICovCiAKQEAgLTU2Myw3ICs1NjUsNyBAQCByb3dfcHVyZ2VfcGFyc2VfdW5kb19y
ZWMoCiAKIAkvKiBSZWFkIHRvIHRoZSBwYXJ0aWFsIHJvdyB0aGUgZmllbGRzIHRoYXQgb2NjdXIg
aW4gaW5kZXhlcyAqLwogCi0JaWYgKCEoY21wbF9pbmZvICYgVVBEX05PREVfTk9fT1JEX0NIQU5H
RSkpIHsKKwlpZiAoIShub2RlLT5jbXBsX2luZm8gJiBVUERfTk9ERV9OT19PUkRfQ0hBTkdFKSkg
ewogCQlwdHIgPSB0cnhfdW5kb19yZWNfZ2V0X3BhcnRpYWxfcm93KHB0ciwgY2x1c3RfaW5kZXgs
CiAJCQkJCQkgICAmKG5vZGUtPnJvdyksIG5vZGUtPmhlYXApOwogCX0KCj09PSBtb2RpZmllZCBm
aWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9k
Yl9wbHVnaW4vQ2hhbmdlTG9nCXJldmlkOmtldmluLmxld2lzQG9yYWNsZS5jb20tMjAxMTA5MjEw
MDEyMzYtbGo1dHhqajV3bnpjdmR6OQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdl
TG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwOTIyMTAzNTAyLW45MTFhNzlu
eGlpNnlkMzYKQEAgLTEsMyArMSw4IEBACisyMDExLTA5LTIwCVRoZSBJbm5vREIgVGVhbQorCisJ
KiByb3cvcm93MHB1cmdlLmM6CisJRml4IEJ1ZyMxMjk2MzgyMyBDUkFTSCBJTiBQVVJHRSBUSFJF
QUQgVU5ERVIgVU5VU1VBTCBDSVJDVU1TVEFOQ0VTCisKIDIwMTEtMDktMTIJVGhlIElubm9EQiBU
ZWFtCiAKIAkqIHJvdy9yb3cwc2VsLmM6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3Jvdy9yb3cwcHVyZ2UuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jv
dy9yb3cwcHVyZ2UuYwlyZXZpZDprZXZpbi5sZXdpc0BvcmFjbGUuY29tLTIwMTEwOTIxMDAxMjM2
LWxqNXR4amo1d256Y3ZkejkKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwcHVy
Z2UuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDkyMjEwMzUwMi1uOTExYTc5
bnhpaTZ5ZDM2CkBAIC00MDYsNyArNDA2LDggQEAgcm93X3B1cmdlX3VwZF9leGlzdF9vcl9leHRl
cm5fZnVuYygKIAogCXV0X2FkKG5vZGUpOwogCi0JaWYgKG5vZGUtPnJlY190eXBlID09IFRSWF9V
TkRPX1VQRF9ERUxfUkVDKSB7CisJaWYgKG5vZGUtPnJlY190eXBlID09IFRSWF9VTkRPX1VQRF9E
RUxfUkVDCisJICAgIHx8IChub2RlLT5jbXBsX2luZm8gJiBVUERfTk9ERV9OT19PUkRfQ0hBTkdF
KSkgewogCiAJCWdvdG8gc2tpcF9zZWNvbmRhcmllczsKIAl9CgpObyBidW5kbGUgKHJlYXNvbjog
dXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==