From: Jorgen Loland
Date: September 29 2011 1:25pm
Subject: bzr push into mysql-trunk branch (jorgen.loland:3453 to 3454)
List-Archive: http://lists.mysql.com/commits/141211
Message-Id: <20110929132539.6F5C5B7@atum21.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0NTQgSm9yZ2VuIExvbGFuZAkyMDExLTA5LTI5CiAgICAgIDEyODM4MTcxOiBQb3N0Zml4OiBC
dWdmaXggcmV2ZXJ0ZWQgc29tZSBvZiB0aGUga2V5X2NvcHlbXSAKICAgICAgY2hhbmdlcy4KCiAg
ICBtb2RpZmllZDoKICAgICAgc3FsL2l0ZW1fc3Vic2VsZWN0LmNjCiAzNDUzIE1hcmtvIE3DpGtl
bMOkCTIwMTEtMDktMjkgW21lcmdlXQogICAgICBNZXJnZSBteXNxbC01LjUgdG8gbXlzcWwtdHJ1
bmsuCgogICAgbW9kaWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvci9ncm91cF9ieS5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC9yL2hhdmluZy5yZXN1bHQKICAgICAgc3FsL3NoYXJlL2Vycm1zZy11dGY4
LnR4dAo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL2l0ZW1fc3Vic2VsZWN0LmNjJwotLS0gYS9zcWwv
aXRlbV9zdWJzZWxlY3QuY2MJMjAxMS0wOS0yOSAxMjo0NzozMiArMDAwMAorKysgYi9zcWwvaXRl
bV9zdWJzZWxlY3QuY2MJMjAxMS0wOS0yOSAxMzoyNToyMiArMDAwMApAQCAtMzM2OSwxNCArMzM2
OSwxMSBAQCBib29sIHN1YnNlbGVjdF9oYXNoX3NqX2VuZ2luZTo6c2V0dXAoTGlzCiAgIGlmICgh
KHRtcF90YWItPnJlZi5rZXlfYnVmZj0KICAgICAgICAgKHVjaGFyKikgdGhkLT5jYWxsb2MoQUxJ
R05fU0laRSh0bXBfa2V5LT5rZXlfbGVuZ3RoKSAqIDIpKSB8fAogICAgICAgISh0bXBfdGFiLT5y
ZWYua2V5X2NvcHk9Ci0gICAgICAgIChzdG9yZV9rZXkqKikgdGhkLT5hbGxvYygoc2l6ZW9mKHN0
b3JlX2tleSopICoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAodG1wX2tleV9w
YXJ0cyArIDEpKSkpIHx8CisgICAgICAgIChzdG9yZV9rZXkqKikgdGhkLT5hbGxvYygoc2l6ZW9m
KHN0b3JlX2tleSopICogdG1wX2tleV9wYXJ0cykpKSB8fAogICAgICAgISh0bXBfdGFiLT5yZWYu
aXRlbXM9CiAgICAgICAgIChJdGVtKiopIHRoZC0+YWxsb2Moc2l6ZW9mKEl0ZW0qKSAqIHRtcF9r
ZXlfcGFydHMpKSkKICAgICBEQlVHX1JFVFVSTihUUlVFKTsKIAotICBLRVlfUEFSVF9JTkZPICpj
dXJfa2V5X3BhcnQ9IHRtcF9rZXktPmtleV9wYXJ0OwotICBzdG9yZV9rZXkgKipyZWZfa2V5PSB0
bXBfdGFiLT5yZWYua2V5X2NvcHk7CiAgIHVjaGFyICpjdXJfcmVmX2J1ZmY9IHRtcF90YWItPnJl
Zi5rZXlfYnVmZjsKIAogICAvKgpAQCAtMzQwOSwxNiArMzQwNiwyMCBAQCBib29sIHN1YnNlbGVj
dF9oYXNoX3NqX2VuZ2luZTo6c2V0dXAoTGlzCiAgIGNvbnRleHQtPmZpcnN0X25hbWVfcmVzb2x1
dGlvbl90YWJsZT0KICAgICBjb250ZXh0LT5sYXN0X25hbWVfcmVzb2x1dGlvbl90YWJsZT0gdG1w
X3RhYmxlX3JlZjsKICAgCi0gIGZvciAodWludCBpPSAwOyBpIDwgdG1wX2tleV9wYXJ0czsgaSsr
LCBjdXJfa2V5X3BhcnQrKywgcmVmX2tleSsrKQorICBLRVlfUEFSVF9JTkZPICprZXlfcGFydHM9
IHRtcF9rZXktPmtleV9wYXJ0OworICBmb3IgKHVpbnQgcGFydF9ubz0gMDsgcGFydF9ubyA8IHRt
cF9rZXlfcGFydHM7IHBhcnRfbm8rKykKICAgewotICAgIEl0ZW1fZnVuY19lcSAqZXFfY29uZDsg
LyogTmV3IGVxdWktam9pbiBjb25kaXRpb24gZm9yIHRoZSBjdXJyZW50IGNvbHVtbi4gKi8KKyAg
ICAvKiBOZXcgZXF1aS1qb2luIGNvbmRpdGlvbiBmb3IgdGhlIGN1cnJlbnQgY29sdW1uLiAqLwor
ICAgIEl0ZW1fZnVuY19lcSAqZXFfY29uZDsgCiAgICAgLyogSXRlbSBmb3IgdGhlIGNvcnJlc3Bv
bmRpbmcgZmllbGQgZnJvbSB0aGUgbWF0ZXJpYWxpemVkIHRlbXAgdGFibGUuICovCiAgICAgSXRl
bV9maWVsZCAqcmlnaHRfY29sX2l0ZW07Ci0gICAgaW50IG51bGxfY291bnQ9IHRlc3QoY3VyX2tl
eV9wYXJ0LT5maWVsZC0+cmVhbF9tYXliZV9udWxsKCkpOwotICAgIHRtcF90YWItPnJlZi5pdGVt
c1tpXT0gaXRlbV9pbi0+bGVmdF9leHByLT5lbGVtZW50X2luZGV4KGkpOworICAgIGludCBudWxs
X2NvdW50PSB0ZXN0KGtleV9wYXJ0c1twYXJ0X25vXS5maWVsZC0+cmVhbF9tYXliZV9udWxsKCkp
OworICAgIHRtcF90YWItPnJlZi5pdGVtc1twYXJ0X25vXT0gaXRlbV9pbi0+bGVmdF9leHByLT5l
bGVtZW50X2luZGV4KHBhcnRfbm8pOwogCi0gICAgaWYgKCEocmlnaHRfY29sX2l0ZW09IG5ldyBJ
dGVtX2ZpZWxkKHRoZCwgY29udGV4dCwgY3VyX2tleV9wYXJ0LT5maWVsZCkpIHx8Ci0gICAgICAg
ICEoZXFfY29uZD0gbmV3IEl0ZW1fZnVuY19lcSh0bXBfdGFiLT5yZWYuaXRlbXNbaV0sIHJpZ2h0
X2NvbF9pdGVtKSkgfHwKKyAgICBpZiAoIShyaWdodF9jb2xfaXRlbT0gbmV3IEl0ZW1fZmllbGQo
dGhkLCBjb250ZXh0LCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
a2V5X3BhcnRzW3BhcnRfbm9dLmZpZWxkKSkgfHwKKyAgICAgICAgIShlcV9jb25kPSBuZXcgSXRl
bV9mdW5jX2VxKHRtcF90YWItPnJlZi5pdGVtc1twYXJ0X25vXSwKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIHJpZ2h0X2NvbF9pdGVtKSkgfHwKICAgICAgICAgKChJdGVtX2Nv
bmRfYW5kKiljb25kKS0+YWRkKGVxX2NvbmQpKQogICAgIHsKICAgICAgIGRlbGV0ZSBjb25kOwpA
QCAtMzQyNiwxOSArMzQyNywyMCBAQCBib29sIHN1YnNlbGVjdF9oYXNoX3NqX2VuZ2luZTo6c2V0
dXAoTGlzCiAgICAgICBEQlVHX1JFVFVSTihUUlVFKTsKICAgICB9CiAKLSAgICAqcmVmX2tleT0g
bmV3IHN0b3JlX2tleV9pdGVtKHRoZCwgY3VyX2tleV9wYXJ0LT5maWVsZCwKLSAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIC8qIFRPRE86Ci0gICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICB0aGUgTlVMTCBieXRlIGlzIHRha2VuIGludG8gYWNjb3VudCBpbgotICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VyX2tleV9wYXJ0LT5zdG9yZV9sZW5ndGgs
IHNvIGluc3RlYWQgb2YKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGN1cl9y
ZWZfYnVmZiArIHRlc3QobWF5YmVfbnVsbCksIHdlIGNvdWxkCi0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICB1c2UgdGhhdCBpbmZvcm1hdGlvbiBpbnN0ZWFkLgotICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgKi8KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIGN1cl9yZWZfYnVmZiArIG51bGxfY291bnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBudWxsX2NvdW50ID8gY3VyX3JlZl9idWZmIDogMCwKLSAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIGN1cl9rZXlfcGFydC0+bGVuZ3RoLCB0bXBfdGFiLT5yZWYuaXRlbXNb
aV0pOwotICAgIGN1cl9yZWZfYnVmZis9IGN1cl9rZXlfcGFydC0+c3RvcmVfbGVuZ3RoOworICAg
IHRtcF90YWItPnJlZi5rZXlfY29weVtwYXJ0X25vXT0gCisgICAgICBuZXcgc3RvcmVfa2V5X2l0
ZW0odGhkLCBrZXlfcGFydHNbcGFydF9ub10uZmllbGQsCisgICAgICAgICAgICAgICAgICAgICAg
ICAgLyogVE9ETzoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGUgTlVMTCBieXRlIGlz
IHRha2VuIGludG8gYWNjb3VudCBpbgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtleV9w
YXJ0c1twYXJ0X25vXS5zdG9yZV9sZW5ndGgsIHNvIGluc3RlYWQgb2YKKyAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBjdXJfcmVmX2J1ZmYgKyB0ZXN0KG1heWJlX251bGwpLCB3ZSBjb3VsZAor
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZSB0aGF0IGluZm9ybWF0aW9uIGluc3RlYWQu
CisgICAgICAgICAgICAgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgICAgICAgICAgICAgICBj
dXJfcmVmX2J1ZmYgKyBudWxsX2NvdW50LAorICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxf
Y291bnQgPyBjdXJfcmVmX2J1ZmYgOiAwLAorICAgICAgICAgICAgICAgICAgICAgICAgIGtleV9w
YXJ0c1twYXJ0X25vXS5sZW5ndGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgdG1wX3RhYi0+
cmVmLml0ZW1zW3BhcnRfbm9dKTsKKyAgICBjdXJfcmVmX2J1ZmYrPSBrZXlfcGFydHNbcGFydF9u
b10uc3RvcmVfbGVuZ3RoOwogICB9Ci0gICpyZWZfa2V5PSBOVUxMOyAvKiBFbmQgbWFya2VyLiAq
LwogICB0bXBfdGFiLT5yZWYua2V5X2Vycj0gMTsKICAgdG1wX3RhYi0+cmVmLmtleV9wYXJ0cz0g
dG1wX2tleV9wYXJ0czsKIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1h
aWxzKS4=