From: Jorgen Loland
Date: August 30 2012 5:59am
Subject: bzr push into mysql-5.1 branch (jorgen.loland:3801 to 3802) Bug#14547952
List-Archive: http://lists.mysql.com/commits/144653
X-Bug: 14547952
Message-Id: <20120830055930.26338.8018.3802@atum21.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4MDIgSm9yZ2VuIExvbGFuZAkyMDEyLTA4LTI4CiAgICAgIEJ1ZyMxNDU0Nzk1MjogREVCVUcg
QlVJTEQgRkFJTFMgQVNTRVJUSU9OIElOIFJFQ09SRFNfSU5fUkFOR0UoKQogICAgICAKICAgICAg
aGFfaW5ub2Jhc2U6OnJlY29yZHNfaW5fcmFuZ2UoKTogUmVtb3ZlIGEgZGVidWcgYXNzZXJ0aW9u
CiAgICAgIHRoYXQgcHJvaGliaXRzIGFuIG9wZW4gcmFuZ2UgKGZ1bGwgdGFibGUpLgogICAgICBU
aGlzIGFzc2VydGlvbiBjYXRjaGVzIHVubmVjZXNzYXJ5IGNhbGxzIHRvIHRoaXMgbWV0aG9kLCAK
ICAgICAgYnV0IHN1Y2ggY2FsbHMgYXJlIG5vdCBoYXJtaW5nIGNvcnJlY3RuZXNzLgoKICAgIG1v
ZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCiAzODAx
IE1hcmtvIE3DpGtlbMOkCTIwMTItMDgtMjEKICAgICAgRml4IHJlZ3Jlc3Npb24gZnJvbSBCdWcj
MTI4NDU3NzQgT1BUSU1JU1RJQyBJTlNFUlQvVVBEQVRFIFVTRVMgV1JPTkcKICAgICAgSEVVUklT
VElDUyBGT1IgQ09NUFJFU1NFRCBQQUdFIFNJWkUKICAgICAgCiAgICAgIFRoZSBmaXggb2YgQnVn
IzEyODQ1Nzc0IHdhcyBzdXBwb3NlZCB0byBza2lwIGtub3duLXRvLWZhaWwKICAgICAgYnRyX2N1
cl9vcHRpbWlzdGljX2luc2VydCgpIGNhbGxzLiBUaGVyZSB3YXMgb25seSBvbmUgc3VjaCBjYWxs
LCBpbgogICAgICBidHJfY3VyX3Blc3NpbWlzdGljX3VwZGF0ZSgpLiBBbGwgb3RoZXIgY2FsbGVy
cyBvZgogICAgICBidHJfY3VyX3Blc3NpbWlzdGljX2luc2VydCgpIHdvdWxkIHJlbGVhc2UgYW5k
IHJlYWNxdWlyZSB0aGUgQi10cmVlCiAgICAgIHBhZ2UgbGF0Y2ggYmVmb3JlIGF0dGVtcHRpbmcg
dGhlIHBlc3NpbWlzdGljIGluc2VydC4gVGhpcyB3b3VsZCBhbGxvdwogICAgICBvdGhlciB0aHJl
YWRzIHRvIHJlc3RydWN0dXJlIHRoZSBCLXRyZWUsIGFsbG93aW5nIChhbmQgcmVxdWlyaW5nKSB0
aGUKICAgICAgaW5zZXJ0IHRvIHN1Y2NlZWQgYXMgYW4gb3B0aW1pc3RpYyAoc2luZ2xlLXBhZ2Up
IG9wZXJhdGlvbi4KICAgICAgCiAgICAgIEZhaWx1cmUgdG8gYXR0ZW1wdCBhbiBvcHRpbWlzdGlj
IGluc2VydCBiZWZvcmUgYSBwZXNzaW1pc3RpYyBvbmUgd291bGQKICAgICAgdHJpZ2dlciBhbiBh
dHRlbXB0IHRvIHNwbGl0IGFuIGVtcHR5IHBhZ2UuCiAgICAgIAogICAgICByYjoxMjM0IGFwcHJv
dmVkIGJ5IFN1bm55IEJhaW5zCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3Bs
dWdpbi9pYnVmL2lidWYwaWJ1Zi5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93
MGlucy5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5u
b2RiLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5ub2RiLmNjCTIwMTIt
MDYtMjkgMTE6MjU6NTcgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lu
bm9kYi5jYwkyMDEyLTA4LTI4IDEyOjUxOjAxICswMDAwCkBAIC02MzgwLDcgKzYzODAsNiBAQCBo
YV9pbm5vYmFzZTo6cmVjb3Jkc19pbl9yYW5nZSgKIAl2b2lkKgkJaGVhcDI7CiAKIAlEQlVHX0VO
VEVSKCJyZWNvcmRzX2luX3JhbmdlIik7Ci0JREJVR19BU1NFUlQobWluX2tleSB8fCBtYXhfa2V5
KTsKIAogCXV0X2EocHJlYnVpbHQtPnRyeCA9PSB0aGRfdG9fdHJ4KGhhX3RoZCgpKSk7CiAKCk5v
IGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku