From: marko.makela
Date: October 15 2012 7:50am
Subject: bzr push into mysql-5.6 branch (marko.makela:4453 to 4455)
List-Archive: http://lists.mysql.com/commits/145040
Message-Id: <20121015075052.29748.65209.4455@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQ0NTUgTWFya28gTcOka2Vsw6QJMjAxMi0xMC0xNQogICAgICBSZW1vdmUgYW4gZXh0cmEgLCB0
byBmaXggYSBjb21waWxlciB3YXJuaW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgKIDQ0NTQgTWFya28gTcOka2Vsw6QJMjAxMi0xMC0x
NQogICAgICBCdWcjMTQ3NTM3MDEgVEFCTEUtQ09QWUlORyBPTkxJTkUgQUxURVIgVEFCTEUgQ1JF
QVRFUyBDT1JSVVBURUQgU0VDT05EQVJZIElOREVYCiAgICAgIAogICAgICByb3dfbG9nX3RhYmxl
X2FwcGx5X3VwZGF0ZSgpOiBJbnZva2UKICAgICAgcm93X3VwZF9jaGFuZ2VzX29yZF9maWVsZF9i
aW5hcnkoKSBwcm9wZXJseS4KICAgICAgCiAgICAgIEltcHJvdmUgdGhlIFJPV19MT0dfQVBQTFlf
UFJJTlQgZGlhZ25vc3RpY3MgZm9yIFdMIzYyNTUgb25saW5lIEFMVEVSIFRBQkxFLgogICAgICAK
ICAgICAgcmI6MTM5OCBhcHByb3ZlZCBieSBKaW1teSBZYW5nCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBsb2cuY2MKIDQ0NTMgTmlzaGEgR29wYWxha3Jpc2hu
YW4JMjAxMi0xMC0xNQogICAgICBCdWcjMTM4NDA1NTM6IE1ZU1FMIE1VU1QgSU1QUk9WRSBFUlJP
UiBNRVNTQUdFUyAKICAgICAgCiAgICAgIEZvbGxvdy11cCBwYXRjaCB0byBmaXggdGVzdCBjYXNl
IGZhaWx1cmUuIAoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3BhcnRzL3Iv
cGFydGl0aW9uX2Jhc2ljX3N5bWxpbmtfaW5ub2RiLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1
aXRlL3BhcnRzL3QvcGFydGl0aW9uX2Jhc2ljX3N5bWxpbmtfaW5ub2RiLnRlc3QKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxvYWQuaCcKLS0tIGEvc3Rv
cmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oCXJldmlkOm5pc2hhLmdvcGFsYWtyaXNo
bmFuQG9yYWNsZS5jb20tMjAxMjEwMTUwNDQ1MDUtdGJweGV5ZTd4b3hsc3Y4bQorKysgYi9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBsb2FkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjEwMTUwNzQ3MTktbDJmcmw2c2htZGpkY3o1cgpAQCAtNTQsNyArNTQsNyBAQCBl
bnVtIGRpY3RfdGFibGVfaW5mb190IHsKIAlESUNUX1RBQkxFX0xPQURfRlJPTV9SRUNPUkQgPSAw
LC8qITwgRGlyZWN0bHkgcG9wdWxhdGUgYSBkaWN0X3RhYmxlX3QKIAkJCQkJc3RydWN0dXJlIHdp
dGggaW5mb3JtYXRpb24gZnJvbQogCQkJCQlhIFNZU19UQUJMRVMgcmVjb3JkICovCi0JRElDVF9U
QUJMRV9MT0FEX0ZST01fQ0FDSEUgPSAxLAkvKiE8IENoZWNrIGZpcnN0IHdoZXRoZXIgZGljdF90
YWJsZV90CisJRElDVF9UQUJMRV9MT0FEX0ZST01fQ0FDSEUgPSAxCS8qITwgQ2hlY2sgZmlyc3Qg
d2hldGhlciBkaWN0X3RhYmxlX3QKIAkJCQkJaXMgaW4gdGhlIGNhY2hlLCBpZiBzbywgcmV0dXJu
IGl0ICovCiB9OwogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93
MGxvZy5jYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDpuaXNo
YS5nb3BhbGFrcmlzaG5hbkBvcmFjbGUuY29tLTIwMTIxMDE1MDQ0NTA1LXRicHhleWU3eG94bHN2
OG0KKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MGxvZy5jYwlyZXZpZDptYXJrby5tYWtl
bGFAb3JhY2xlLmNvbS0yMDEyMTAxNTA3NDcxOS1sMmZybDZzaG1kamRjejVyCkBAIC0xMjI5LDgg
KzEyMjksOSBAQCByb3dfbG9nX3RhYmxlX2FwcGx5X2luc2VydF9sb3coCiAKICNpZmRlZiBST1df
TE9HX0FQUExZX1BSSU5UCiAJaWYgKHJvd19sb2dfYXBwbHlfcHJpbnQpIHsKLQkJZnByaW50Zihz
dGRlcnIsICJ0YWJsZSBhcHBseSBpbnNlcnQgIiBJQl9JRF9GTVQsCi0JCQlkdXAtPmluZGV4LT5p
ZCk7CisJCWZwcmludGYoc3RkZXJyLCAidGFibGUgYXBwbHkgaW5zZXJ0ICIKKwkJCUlCX0lEX0ZN
VCAiICIgSUJfSURfRk1UICJcbiIsCisJCQlpbmRleC0+dGFibGUtPmlkLCBpbmRleC0+aWQpOwog
CQlkdHVwbGVfcHJpbnQoc3RkZXJyLCByb3cpOwogCX0KICNlbmRpZiAvKiBST1dfTE9HX0FQUExZ
X1BSSU5UICovCkBAIC0xMzQ1LDYgKzEzNDYsMTQgQEAgcm93X2xvZ190YWJsZV9hcHBseV9kZWxl
dGVfbG93KAogCiAJdXRfYWQoZGljdF9pbmRleF9pc19jbHVzdChpbmRleCkpOwogCisjaWZkZWYg
Uk9XX0xPR19BUFBMWV9QUklOVAorCWlmIChyb3dfbG9nX2FwcGx5X3ByaW50KSB7CisJCWZwcmlu
dGYoc3RkZXJyLCAidGFibGUgYXBwbHkgZGVsZXRlICIKKwkJCUlCX0lEX0ZNVCAiICIgSUJfSURf
Rk1UICJcbiIsCisJCQlpbmRleC0+dGFibGUtPmlkLCBpbmRleC0+aWQpOworCQlyZWNfcHJpbnRf
bmV3KHN0ZGVyciwgYnRyX3BjdXJfZ2V0X3JlYyhwY3VyKSwgb2Zmc2V0cyk7CisJfQorI2VuZGlm
IC8qIFJPV19MT0dfQVBQTFlfUFJJTlQgKi8KIAlpZiAoZGljdF90YWJsZV9nZXRfbmV4dF9pbmRl
eChpbmRleCkpIHsKIAkJLyogQnVpbGQgYSByb3cgdGVtcGxhdGUgZm9yIHB1cmdpbmcgc2Vjb25k
YXJ5IGluZGV4IGVudHJpZXMuICovCiAJCXJvdyA9IHJvd19idWlsZCgKQEAgLTE2OTQsNiArMTcw
MywxNSBAQCBkZWxldGVfaW5zZXJ0OgogCQkJUk9XX0NPUFlfREFUQSwgaW5kZXgsIGJ0cl9wY3Vy
X2dldF9yZWMoJnBjdXIpLAogCQkJY3VyX29mZnNldHMsIE5VTEwsIE5VTEwsIE5VTEwsICZvbGRf
ZXh0LCBoZWFwKTsKIAkJdXRfYWQob2xkX3Jvdyk7CisjaWZkZWYgUk9XX0xPR19BUFBMWV9QUklO
VAorCQlpZiAocm93X2xvZ19hcHBseV9wcmludCkgeworCQkJZnByaW50ZihzdGRlcnIsICJ0YWJs
ZSBhcHBseSB1cGRhdGUgIgorCQkJCUlCX0lEX0ZNVCAiICIgSUJfSURfRk1UICJcbiIsCisJCQkJ
aW5kZXgtPnRhYmxlLT5pZCwgaW5kZXgtPmlkKTsKKwkJCWR0dXBsZV9wcmludChzdGRlcnIsIG9s
ZF9yb3cpOworCQkJZHR1cGxlX3ByaW50KHN0ZGVyciwgcm93KTsKKwkJfQorI2VuZGlmIC8qIFJP
V19MT0dfQVBQTFlfUFJJTlQgKi8KIAl9IGVsc2UgewogCQlvbGRfcm93ID0gTlVMTDsKIAkJb2xk
X2V4dCA9IE5VTEw7CkBAIC0xNzMwLDcgKzE3NDgsNyBAQCBkZWxldGVfaW5zZXJ0OgogCQl9CiAK
IAkJaWYgKCFyb3dfdXBkX2NoYW5nZXNfb3JkX2ZpZWxkX2JpbmFyeSgKLQkJCSAgICBpbmRleCwg
dXBkYXRlLCB0aHIsIHJvdywgTlVMTCkpIHsKKwkJCSAgICBpbmRleCwgdXBkYXRlLCB0aHIsIG9s
ZF9yb3csIE5VTEwpKSB7CiAJCQljb250aW51ZTsKIAkJfQogCkBAIC0xNzUzLDkgKzE3NzEsNyBA
QCBkZWxldGVfaW5zZXJ0OgogCiAJCWJ0cl9jdXJfcGVzc2ltaXN0aWNfZGVsZXRlKAogCQkJJmVy
cm9yLCBGQUxTRSwgYnRyX3BjdXJfZ2V0X2J0cl9jdXIoJnBjdXIpLAotCQkJQlRSX0NSRUFURV9G
TEFHIHwgQlRSX05PX0xPQ0tJTkdfRkxBRwotCQkJfCBCVFJfTk9fVU5ET19MT0dfRkxBRyB8IEJU
Ul9LRUVQX1NZU19GTEFHLAotCQkJUkJfTk9ORSwgJm10cik7CisJCQlCVFJfQ1JFQVRFX0ZMQUcs
IFJCX05PTkUsICZtdHIpOwogCiAJCWlmIChlcnJvciAhPSBEQl9TVUNDRVNTKSB7CiAJCQlicmVh
azsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku