From: Sergey Vojtovich
Date: October 21 2011 5:43am
Subject: bzr push into mysql-5.5 branch (sergey.vojtovich:3585 to 3586)
List-Archive: http://lists.mysql.com/commits/141527
Message-Id: <201110210540.p9L5e1TR031057@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM1ODYgU2VyZ2V5IFZvanRvdmljaAkyMDExLTEwLTIxIFttZXJnZV0KICAgICAgTWVyZ2UuCgog
ICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0CiAgICAgIG15c3Fs
LXRlc3QvdC9teWlzYW0udGVzdAogICAgICBzdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MKICAg
ICAgc3RvcmFnZS9teWlzYW0vbWlfZGVsZXRlX2FsbC5jCiAzNTg1IE1hcmtvIE3DpGtlbMOkCTIw
MTEtMTAtMjEgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjEgdG8gbXlzcWwtNS41LgoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2J0ci9idHIwY3VyLmMKPT09IG1vZGlm
aWVkIGZpbGUgJ215c3FsLXRlc3Qvci9teWlzYW0ucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iv
bXlpc2FtLnJlc3VsdAkyMDEwLTA0LTI3IDA5OjU4OjIxICswMDAwCisrKyBiL215c3FsLXRlc3Qv
ci9teWlzYW0ucmVzdWx0CTIwMTEtMTAtMjEgMDU6MzU6MDcgKzAwMDAKQEAgLTI0MTQsNiArMjQx
NCwzMCBAQCBDQVJESU5BTElUWQogRFJPUCBUQUJMRSB0MTsKIFNFVCBteWlzYW1fc29ydF9idWZm
ZXJfc2l6ZT1AQGdsb2JhbC5teWlzYW1fc29ydF9idWZmZXJfc2l6ZTsKIFNFVCBteWlzYW1fcmVw
YWlyX3RocmVhZHM9QEBnbG9iYWwubXlpc2FtX3JlcGFpcl90aHJlYWRzOworIworIyBCVUcjMTE3
NTcwMzIgLSA0OTAzMDogT1BUSU1JWkUgVEFCTEUgQlJFQUtTIE1ZSVNBTSBUQUJMRSBXSEVOCisj
ICAgICAgICAgICAgICAgIFVTSU5HIE1ZSVNBTV9VU0VfTU1BUCBPTiBXSU5ET1dTCisjCitTRVQg
R0xPQkFMIG15aXNhbV91c2VfbW1hcD0xOworQ1JFQVRFIFRBQkxFIHQxKGEgSU5UKTsKK0lOU0VS
VCBJTlRPIHQxIFZBTFVFUygxKSwoMik7CitERUxFVEUgRlJPTSB0MSBXSEVSRSBhPTE7CitGTFVT
SCBUQUJMRSB0MTsKK0xPQ0sgVEFCTEUgdDEgV1JJVEU7CitPUFRJTUlaRSBUQUJMRSB0MTsKK1Rh
YmxlCU9wCU1zZ190eXBlCU1zZ190ZXh0Cit0ZXN0LnQxCW9wdGltaXplCXN0YXR1cwlPSworSU5T
RVJUIElOVE8gdDEgVkFMVUVTKDMpOworVU5MT0NLIFRBQkxFUzsKK1NFTEVDVCAqIEZST00gdDE7
CithCisyCiszCitDSEVDSyBUQUJMRSB0MTsKK1RhYmxlCU9wCU1zZ190eXBlCU1zZ190ZXh0Cit0
ZXN0LnQxCWNoZWNrCXN0YXR1cwlPSworRFJPUCBUQUJMRSB0MTsKK1NFVCBHTE9CQUwgbXlpc2Ft
X3VzZV9tbWFwPWRlZmF1bHQ7CiBFbmQgb2YgNS4xIHRlc3RzCiAjCiAjIEJ1ZyM1MTMyNyBNeUlT
QU0gdGFibGUgaXMgYXV0b21hdGljYWxseSByZXBhaXJlZCBvbiBBTFRFUgoKPT09IG1vZGlmaWVk
IGZpbGUgJ215c3FsLXRlc3QvdC9teWlzYW0udGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L215aXNh
bS50ZXN0CTIwMTAtMDQtMjAgMDg6NTE6NTAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC90L215aXNh
bS50ZXN0CTIwMTEtMTAtMjEgMDU6MzU6MDcgKzAwMDAKQEAgLTE2NDcsNiArMTY0NywyNCBAQCBE
Uk9QIFRBQkxFIHQxOwogU0VUIG15aXNhbV9zb3J0X2J1ZmZlcl9zaXplPUBAZ2xvYmFsLm15aXNh
bV9zb3J0X2J1ZmZlcl9zaXplOwogU0VUIG15aXNhbV9yZXBhaXJfdGhyZWFkcz1AQGdsb2JhbC5t
eWlzYW1fcmVwYWlyX3RocmVhZHM7CiAKKy0tZWNobyAjCistLWVjaG8gIyBCVUcjMTE3NTcwMzIg
LSA0OTAzMDogT1BUSU1JWkUgVEFCTEUgQlJFQUtTIE1ZSVNBTSBUQUJMRSBXSEVOCistLWVjaG8g
IyAgICAgICAgICAgICAgICBVU0lORyBNWUlTQU1fVVNFX01NQVAgT04gV0lORE9XUworLS1lY2hv
ICMKK1NFVCBHTE9CQUwgbXlpc2FtX3VzZV9tbWFwPTE7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQp
OworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDEpLCgyKTsKK0RFTEVURSBGUk9NIHQxIFdIRVJFIGE9
MTsKK0ZMVVNIIFRBQkxFIHQxOworTE9DSyBUQUJMRSB0MSBXUklURTsKK09QVElNSVpFIFRBQkxF
IHQxOworSU5TRVJUIElOVE8gdDEgVkFMVUVTKDMpOworVU5MT0NLIFRBQkxFUzsKK1NFTEVDVCAq
IEZST00gdDE7CitDSEVDSyBUQUJMRSB0MTsKK0RST1AgVEFCTEUgdDE7CitTRVQgR0xPQkFMIG15
aXNhbV91c2VfbW1hcD1kZWZhdWx0OworCiAtLWVjaG8gRW5kIG9mIDUuMSB0ZXN0cwogCiAKCj09
PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL215aXNhbS9oYV9teWlzYW0uY2MnCi0tLSBhL3N0b3Jh
Z2UvbXlpc2FtL2hhX215aXNhbS5jYwkyMDExLTA4LTE1IDE4OjEyOjExICswMDAwCisrKyBiL3N0
b3JhZ2UvbXlpc2FtL2hhX215aXNhbS5jYwkyMDExLTEwLTIxIDA1OjM1OjA3ICswMDAwCkBAIC0x
MDI2LDYgKzEwMjYsMTggQEAgaW50IGhhX215aXNhbTo6cmVwYWlyKFRIRCAqdGhkLCBNSV9DSEVD
SwogCQkJbWlfZ2V0X21hc2tfYWxsX2tleXNfYWN0aXZlKHNoYXJlLT5iYXNlLmtleXMpIDoKIAkJ
CXNoYXJlLT5zdGF0ZS5rZXlfbWFwKTsKICAgICB1aW50IHRlc3RmbGFnPXBhcmFtLnRlc3RmbGFn
OworI2lmZGVmIEhBVkVfTU1BUAorICAgIGJvb2wgcmVtYXA9IHRlc3Qoc2hhcmUtPmZpbGVfbWFw
KTsKKyAgICAvKgorICAgICAgbWlfcmVwYWlyKigpIGZ1bmN0aW9ucyBmYW1pbHkgdXNlIGZpbGUg
SS9PIGV2ZW4gaWYgbWVtb3J5CisgICAgICBtYXBwaW5nIGlzIGF2YWlsYWJsZS4KKworICAgICAg
U2luY2UgbWl4aW5nIG1tYXAgSS9PIGFuZCBmaWxlIEkvTyBtYXkgY2F1c2UgdmFyaW91cyBhcnRp
ZmFjdHMsCisgICAgICBtZW1vcnkgbWFwcGluZyBtdXN0IGJlIGRpc2FibGVkLgorICAgICovCisg
ICAgaWYgKHJlbWFwKQorICAgICAgbWlfbXVubWFwX2ZpbGUoZmlsZSk7CisjZW5kaWYKICAgICBp
ZiAobWlfdGVzdF9pZl9zb3J0X3JlcChmaWxlLGZpbGUtPnN0YXRlLT5yZWNvcmRzLGtleV9tYXAs
MCkgJiYKIAkobG9jYWxfdGVzdGZsYWcgJiBUX1JFUF9CWV9TT1JUKSkKICAgICB7CkBAIC0xMDU3
LDYgKzEwNjksMTAgQEAgaW50IGhhX215aXNhbTo6cmVwYWlyKFRIRCAqdGhkLCBNSV9DSEVDSwog
ICAgICAgZXJyb3I9ICBtaV9yZXBhaXIoJnBhcmFtLCBmaWxlLCBmaXhlZF9uYW1lLAogCQkJcGFy
YW0udGVzdGZsYWcgJiBUX1FVSUNLKTsKICAgICB9CisjaWZkZWYgSEFWRV9NTUFQCisgICAgaWYg
KHJlbWFwKQorICAgICAgbWlfZHlubWFwX2ZpbGUoZmlsZSwgZmlsZS0+c3RhdGUtPmRhdGFfZmls
ZV9sZW5ndGgpOworI2VuZGlmCiAgICAgcGFyYW0udGVzdGZsYWc9dGVzdGZsYWc7CiAgICAgb3B0
aW1pemVfZG9uZT0xOwogICB9Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9teWlzYW0vbWlf
ZGVsZXRlX2FsbC5jJwotLS0gYS9zdG9yYWdlL215aXNhbS9taV9kZWxldGVfYWxsLmMJMjAxMS0w
Ni0zMCAxNTo0Njo1MyArMDAwMAorKysgYi9zdG9yYWdlL215aXNhbS9taV9kZWxldGVfYWxsLmMJ
MjAxMS0xMC0yMSAwNTozNTowNyArMDAwMApAQCAtNjEsMTEgKzYxLDYgQEAgaW50IG1pX2RlbGV0
ZV9hbGxfcm93cyhNSV9JTkZPICppbmZvKQogICAgICAgbXlzcWxfZmlsZV9jaHNpemUoc2hhcmUt
PmtmaWxlLCBzaGFyZS0+YmFzZS5rZXlzdGFydCwgMCwgTVlGKE1ZX1dNRSkpKQogICAgIGdvdG8g
ZXJyOwogICAodm9pZCkgX21pX3dyaXRlaW5mbyhpbmZvLFdSSVRFSU5GT19VUERBVEVfS0VZRklM
RSk7Ci0jaWZkZWYgSEFWRV9NTUFQCi0gIC8qIE1hcCBhZ2FpbiAqLwotICBpZiAoc2hhcmUtPmZp
bGVfbWFwKQotICAgIG1pX2R5bm1hcF9maWxlKGluZm8sIChteV9vZmZfdCkgMCk7Ci0jZW5kaWYK
ICAgREJVR19SRVRVUk4oMCk7CiAKIGVycjoKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku