From: Ole John Aske
Date: May 13 2011 8:38am
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4375 to 4376)
List-Archive: http://lists.mysql.com/commits/137290
Message-Id: <20110513083820.C9BBE222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQzNzYgT2xlIEpvaG4gQXNrZQkyMDExLTA1LTEzCiAgICAgIEZpeGVkIGEgcHJvYmxlbSBpbiBT
UEogYmxvY2sgd2l0aCAnYnVzaHkgaW5kZXggc2NhbnMnIHdoZXJlIGNvbmRpdGlvbgogICAgICBm
b3Igd2hlbiB0byByZWxlYXNlIG9yIGtlZXAgYnVmZmVyZWQgcm93cyBhbmQvb3IgcmFuZ2VrZXlz
IAogICAgICB3YXMgaW5jb3JyZWN0LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL25kYi9z
cmMva2VybmVsL2Jsb2Nrcy9kYnNwai9EYnNwak1haW4uY3BwCiA0Mzc1IE1hZ251cyBCbMOldWRk
CTIwMTEtMDUtMTIgW21lcmdlXQogICAgICBNZXJnZQoKICAgIG1vZGlmaWVkOgogICAgICBteXNx
bC10ZXN0L3N1aXRlL3JwbF9uZGIvdC9ycGxfbmRiX2dhcF9ldmVudC50ZXN0CiAgICAgIHN0b3Jh
Z2UvbmRiL3NyYy9jb21tb24vcG9ydGxpYi9OZGJUQ1AuY3BwCj09PSBtb2RpZmllZCBmaWxlICdz
dG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYnNwai9EYnNwak1haW4uY3BwJwotLS0gYS9z
dG9yYWdlL25kYi9zcmMva2VybmVsL2Jsb2Nrcy9kYnNwai9EYnNwak1haW4uY3BwCTIwMTEtMDUt
MDQgMTE6NDU6MzMgKzAwMDAKKysrIGIvc3RvcmFnZS9uZGIvc3JjL2tlcm5lbC9ibG9ja3MvZGJz
cGovRGJzcGpNYWluLmNwcAkyMDExLTA1LTEzIDA4OjM4OjAxICswMDAwCkBAIC0xMTUwLDcgKzEx
NTAsNyBAQCBEYnNwajo6YmF0Y2hDb21wbGV0ZShTaWduYWwqIHNpZ25hbCwgUHRyCiAvKioKICAq
IExvY2F0ZSBuZXh0IFRyZWVOb2RlKHMpIHRvIHJldHJpZXZlIG1vcmUgcm93cyBmcm9tLgogICoK
LSAqICAgQ2FsY3VsZSBzZXQgb2YgJ21fYWN0aXZlX25vZGVzJyB3ZSB3aWxsIHJlY2VpdmUgZnJv
bSBpbiBORVhUUkVRLgorICogICBDYWxjdWxhdGUgc2V0IG9mIHRoZSAnbV9hY3RpdmVfbm9kZXMn
IHdlIHdpbGwgcmVjZWl2ZSBmcm9tIGluIE5FWFRSRVEuCiAgKiAgIEFkZCB0aGVzZSBUcmVlTm9k
ZXMgdG8gdGhlIGN1cnNvciBsaXN0IHRvIGJlIGl0ZXJhdGVkLgogICovCiB2b2lkCkBAIC0xMTY4
LDcgKzExNjgsNyBAQCBEYnNwajo6cHJlcGFyZU5leHRCYXRjaChTaWduYWwqIHNpZ25hbCwgCiAg
IGlmIChyZXF1ZXN0UHRyLnAtPm1fYml0cyAmIFJlcXVlc3Q6OlJUX1JFUEVBVF9TQ0FOX1JFU1VM
VCkKICAgewogICAgIC8qKgotICAgICAqIElmIFJFUEVBVF9TQ0FOX1JFU1VMVCB3ZSBoYW5kbGUg
YnlzaHkgc2NhbnMgYnkgcmV0dXJuIG1vcmUgKm5ldyogcm93cworICAgICAqIElmIFJFUEVBVF9T
Q0FOX1JFU1VMVCB3ZSBoYW5kbGUgYnVzaHkgc2NhbnMgYnkgcmV0dXJuIG1vcmUgKm5ldyogcm93
cwogICAgICAqIGZyb20gb25seSBvbmUgb2YgdGhlIGFjdGl2ZSBjaGlsZCBzY2Fucy4gSWYgdGhl
cmUgYXJlIG11bHRpcGxlIAogICAgICAqIGJ1c2h5IHNjYW5zIG5vdCBiZWluZyBhYmxlIHRvIHJl
dHVybiB0aGVpciBjdXJyZW50IHJlc3VsdCBzZXQgaW4gCiAgICAgICogYSBzaW5nbGUgYmF0Y2gs
IHJlc3VsdCBzZXRzIGZyb20gdGhlIG90aGVyIGNoaWxkIHNjYW5zIGFyZSByZXBlYXRlZApAQCAt
MTIzOSw3ICsxMjM5LDcgQEAgRGJzcGo6OnByZXBhcmVOZXh0QmF0Y2goU2lnbmFsKiBzaWduYWws
IAogICB7CiAgICAgLyoqCiAgICAgICogSWYgbm90IFJFUEVBVF9TQ0FOX1JFU1VMVCBtdWx0aXBs
ZSBhY3RpdmUgVHJlZU5vZGVzIG1heSByZXR1cm4gdGhlaXIgCi0gICAgICogcmVtYWluaW5nIHJl
c3VsdCBzaW11bHRhbmVvdXNseS4gSW4gY2FzZSBvZiBieXNoeS1zY2FucywgdGhlc2UKKyAgICAg
KiByZW1haW5pbmcgcmVzdWx0IHNpbXVsdGFuZW91c2x5LiBJbiBjYXNlIG9mIGJ1c2h5LXNjYW5z
LCB0aGVzZQogICAgICAqIGNvbmN1cnJlbnQgcmVzdWx0IHN0cmVhbXMgYXJlIGNyb3NzIGpvaW5z
IG9mIGVhY2ggb3RoZXIKICAgICAgKiBpbiBTUUwgdGVybXMuIEluIG9yZGVyIHRvIHByb2R1Y2Ug
dGhlIGNyb3NzIGpvaW5lZCByZXN1bHQsIGl0IGlzCiAgICAgICogdGhlIHJlc3BvbnNpYmlsaXR5
IG9mIHRoZSBBUEktY2xpZW50IHRvIGJ1ZmZlciB0aGVzZSBzdHJlYW1zIGFuZApAQCAtMTQxNSw3
ICsxNDE1LDEzIEBAIERic3BqOjpyZWxlYXNlU2NhbkJ1ZmZlcnMoUHRyPFJlcXVlc3Q+IHIKICAg
ICAgICAgcmVsZWFzZU5vZGVSb3dzKHJlcXVlc3RQdHIsIHRyZWVOb2RlUHRyKTsKICAgICAgIH0K
ICAgICAgIAotICAgICAgaWYgKHRyZWVOb2RlUHRyLnAtPm1fc3RhdGUgPT0gVHJlZU5vZGU6OlRO
X0FDVElWRSkKKyAgICAgIC8qKgorICAgICAgICogQ2xlYW51cCBBQ1RJVkUgbm9kZXMgZmV0Y2hp
bmcgbW9yZSByb3dzIGluIGEgTkVYVFJFUSwKKyAgICAgICAqIG9yIG5vZGVzIGJlaW5nIGluICdt
X2FjdGl2ZV9ub2RlcycgYXMgdGhleSB3aWxsICdyZXBlYXQnLgorICAgICAgICogKGFuZCB0aGVu
IGJlY29tZSBhY3RpdmUpCisgICAgICAgKi8KKyAgICAgIGlmICh0cmVlTm9kZVB0ci5wLT5tX3N0
YXRlID09IFRyZWVOb2RlOjpUTl9BQ1RJVkUgfHwKKyAgICAgICAgICByZXF1ZXN0UHRyLnAtPm1f
YWN0aXZlX25vZGVzLmdldCh0cmVlTm9kZVB0ci5wLT5tX25vZGVfbm8pKQogICAgICAgewogICAg
ICAgICBqYW0oKTsKICAgICAgICAgY2xlYW51cENoaWxkQnJhbmNoKHJlcXVlc3RQdHIsIHRyZWVO
b2RlUHRyKTsKQEAgLTE0MjMsOSArMTQyOSwxMSBAQCBEYnNwajo6cmVsZWFzZVNjYW5CdWZmZXJz
KFB0cjxSZXF1ZXN0PiByCiAgICAgfQogCiAgICAgLyoqCi0gICAgICAqIEJ1aWxkIEJpdG1hc2sg
b2YgYWxsIG5vZGVzIGhhdmluZyBUTl9BQ1RJVkUgY2hpbGRzCisgICAgICAqIENvbGxlY3QgYW5j
ZXN0b3JzIG9mIGFsbCBub2RlcyB3aGljaCBhcmUsIG9yIHdpbGwKKyAgICAgICogYmVjb21lIGFj
dGl2ZSBpbiBORVhUUkVRIChwb3NzaWJseSByZXBlYXRlZCkKICAgICAgICovCi0gICAgaWYgKHRy
ZWVOb2RlUHRyLnAtPm1fc3RhdGUgPT0gVHJlZU5vZGU6OlROX0FDVElWRSkKKyAgICBpZiAodHJl
ZU5vZGVQdHIucC0+bV9zdGF0ZSA9PSBUcmVlTm9kZTo6VE5fQUNUSVZFIHx8CisgICAgICAgIHJl
cXVlc3RQdHIucC0+bV9hY3RpdmVfbm9kZXMuZ2V0KHRyZWVOb2RlUHRyLnAtPm1fbm9kZV9ubykp
CiAgICAgewogICAgICAgYW5jZXN0b3JzX29mX2FjdGl2ZS5iaXRPUih0cmVlTm9kZVB0ci5wLT5t
X2FuY2VzdG9ycyk7CiAgICAgfQoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2gg
ZW1haWxzKS4=