From: Mikael Ronstrom
Date: May 13 2011 2:14pm
Subject: bzr push into mysql-trunk branch (mikael.ronstrom:3370 to 3371)
List-Archive: http://lists.mysql.com/commits/137336
Message-Id: <201105131415.p4DEFS7W027629@dator6>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMzNzEgTWlrYWVsIFJvbnN0cm9tCTIwMTEtMDUtMTMgW21lcmdlXQogICAgICBtZXJnZQoKICAg
IG1vZGlmaWVkOgogICAgICBzcWwvbXlzcWxkLmNjCiAgICAgIHNxbC9teXNxbGQuaAogMzM3MCBN
aWthZWwgUm9uc3Ryw7ZtCTIwMTEtMDUtMTMKICAgICAgbWVyZ2UgZml4CgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvc3J2L3NydjBjb25jLmMKPT09IG1vZGlmaWVkIGZpbGUg
J3NxbC9teXNxbGQuY2MnCi0tLSBhL3NxbC9teXNxbGQuY2MJcmV2aWQ6bWlrYWVsQGRhdG9yOS0y
MDExMDUxMzEyNDcwNy1qMmY5c3lhZDU2bnIwZnFvCisrKyBiL3NxbC9teXNxbGQuY2MJcmV2aWQ6
bWlrYWVsLnJvbnN0cm9tQG9yYWNsZS5jb20tMjAxMTA1MTMxNDExMzQtcjE4bGJtMWE1cWViZ2lm
ZgpAQCAtNDQ2LDcgKzQ0Niw3IEBAIHVpbnQgbG93ZXJfY2FzZV90YWJsZV9uYW1lczsKIHVsb25n
IHRjX2hldXJpc3RpY19yZWNvdmVyPSAwOwogdWludCB2b2xhdGlsZSB0aHJlYWRfY291bnQ7CiBp
bnQzMiB0aHJlYWRfcnVubmluZzsKLU1ZU1FMX1BMVUdJTl9JTVBPUlQgdWxvbmcgdGhyZWFkX2Ny
ZWF0ZWQ7Cit1bG9uZyB0aHJlYWRfY3JlYXRlZDsKIHVsb25nIGJhY2tfbG9nLCBjb25uZWN0X3Rp
bWVvdXQsIGNvbmN1cnJlbmN5LCBzZXJ2ZXJfaWQ7CiB1bG9uZyB0YWJsZV9jYWNoZV9zaXplLCB0
YWJsZV9kZWZfc2l6ZTsKIHVsb25nIHdoYXRfdG9fbG9nOwpAQCAtNDczLDggKzQ3Myw3IEBAIHVs
b25nIGRlbGF5ZWRfaW5zZXJ0X2Vycm9ycyxmbHVzaF90aW1lOwogdWxvbmcgc3BlY2lhbGZsYWc9
MDsKIHVsb25nIGJpbmxvZ19jYWNoZV91c2U9IDAsIGJpbmxvZ19jYWNoZV9kaXNrX3VzZT0gMDsK
IHVsb25nIGJpbmxvZ19zdG10X2NhY2hlX3VzZT0gMCwgYmlubG9nX3N0bXRfY2FjaGVfZGlza191
c2U9IDA7Ci1NWVNRTF9QTFVHSU5fSU1QT1JUIHVsb25nIG1heF9jb25uZWN0aW9uczsKLXVsb25n
IG1heF9jb25uZWN0X2Vycm9yczsKK3Vsb25nIG1heF9jb25uZWN0aW9ucywgbWF4X2Nvbm5lY3Rf
ZXJyb3JzOwogLyoqCiAgIExpbWl0IG9mIHRoZSB0b3RhbCBudW1iZXIgb2YgcHJlcGFyZWQgc3Rh
dGVtZW50cyBpbiB0aGUgc2VydmVyLgogICBJcyBuZWNlc3NhcnkgdG8gcHJvdGVjdCB0aGUgc2Vy
dmVyIGFnYWluc3Qgb3V0LW9mLW1lbW9yeSBhdHRhY2tzLgpAQCAtNTc4LDcgKzU3Nyw3IEBAIExl
X2NyZWF0b3IgbGVfY3JlYXRvcjsKIE1ZU1FMX0ZJTEUgKmJvb3RzdHJhcF9maWxlOwogaW50IGJv
b3RzdHJhcF9lcnJvcjsKIAotTVlTUUxfUExVR0lOX0lNUE9SVCBJX0xpc3Q8VEhEPiB0aHJlYWRz
OworSV9MaXN0PFRIRD4gdGhyZWFkczsKIFJwbF9maWx0ZXIqIHJwbF9maWx0ZXI7CiBScGxfZmls
dGVyKiBiaW5sb2dfZmlsdGVyOwogCkBAIC02MjcsOSArNjI2LDkgQEAgbXlzcWxfbXV0ZXhfdCBM
T0NLX2Rlc19rZXlfZmlsZTsKICNlbmRpZgogbXlzcWxfcndsb2NrX3QgTE9DS19ncmFudCwgTE9D
S19zeXNfaW5pdF9jb25uZWN0LCBMT0NLX3N5c19pbml0X3NsYXZlOwogbXlzcWxfcndsb2NrX3Qg
TE9DS19zeXN0ZW1fdmFyaWFibGVzX2hhc2g7Ci1NWVNRTF9QTFVHSU5fSU1QT1JUIG15c3FsX2Nv
bmRfdCBDT05EX3RocmVhZF9jb3VudDsKK215c3FsX2NvbmRfdCBDT05EX3RocmVhZF9jb3VudDsK
IHB0aHJlYWRfdCBzaWduYWxfdGhyZWFkOwotTVlTUUxfUExVR0lOX0lNUE9SVCBwdGhyZWFkX2F0
dHJfdCBjb25uZWN0aW9uX2F0dHJpYjsKK3B0aHJlYWRfYXR0cl90IGNvbm5lY3Rpb25fYXR0cmli
OwogbXlzcWxfbXV0ZXhfdCBMT0NLX3NlcnZlcl9zdGFydGVkOwogbXlzcWxfY29uZF90IENPTkRf
c2VydmVyX3N0YXJ0ZWQ7CiAKQEAgLTgyNjksOSArODI2OCw3IEBAIHN0YXRpYyBQU0lfY29uZF9p
bmZvIGFsbF9zZXJ2ZXJfY29uZHNbXT0KIAogUFNJX3RocmVhZF9rZXkga2V5X3RocmVhZF9ib290
c3RyYXAsIGtleV90aHJlYWRfZGVsYXllZF9pbnNlcnQsCiAgIGtleV90aHJlYWRfaGFuZGxlX21h
bmFnZXIsIGtleV90aHJlYWRfbWFpbiwKLSAga2V5X3RocmVhZF9zaWduYWxfaGFuZDsKLQotTVlT
UUxfUExVR0lOX0lNUE9SVCBQU0lfdGhyZWFkX2tleSBrZXlfdGhyZWFkX29uZV9jb25uZWN0aW9u
OworICBrZXlfdGhyZWFkX29uZV9jb25uZWN0aW9uLCBrZXlfdGhyZWFkX3NpZ25hbF9oYW5kOwog
CiBzdGF0aWMgUFNJX3RocmVhZF9pbmZvIGFsbF9zZXJ2ZXJfdGhyZWFkc1tdPQogewoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3NxbC9teXNxbGQuaCcKLS0tIGEvc3FsL215c3FsZC5oCXJldmlkOm1pa2Fl
bEBkYXRvcjktMjAxMTA1MTMxMjQ3MDctajJmOXN5YWQ1Nm5yMGZxbworKysgYi9zcWwvbXlzcWxk
LmgJcmV2aWQ6bWlrYWVsLnJvbnN0cm9tQG9yYWNsZS5jb20tMjAxMTA1MTMxNDExMzQtcjE4bGJt
MWE1cWViZ2lmZgpAQCAtMjIxLDEyICsyMjEsMTIgQEAgZXh0ZXJuIHN0cnVjdCBteV9vcHRpb24g
bXlfbG9uZ19vcHRpb25zWwogZXh0ZXJuIGludCBteXNxbGRfc2VydmVyX3N0YXJ0ZWQ7CiBleHRl
cm4gIkMiIE1ZU1FMX1BMVUdJTl9JTVBPUlQgaW50IG9yaWdfYXJnYzsKIGV4dGVybiAiQyIgTVlT
UUxfUExVR0lOX0lNUE9SVCBjaGFyICoqb3JpZ19hcmd2OwotZXh0ZXJuIE1ZU1FMX1BMVUdJTl9J
TVBPUlQgcHRocmVhZF9hdHRyX3QgY29ubmVjdGlvbl9hdHRyaWI7CitleHRlcm4gcHRocmVhZF9h
dHRyX3QgY29ubmVjdGlvbl9hdHRyaWI7CiBleHRlcm4gTVlTUUxfRklMRSAqYm9vdHN0cmFwX2Zp
bGU7CiBleHRlcm4gbXlfYm9vbCBvbGRfbW9kZTsKIGV4dGVybiBMRVhfU1RSSU5HIG9wdF9pbml0
X2Nvbm5lY3QsIG9wdF9pbml0X3NsYXZlOwogZXh0ZXJuIGludCBib290c3RyYXBfZXJyb3I7Ci1l
eHRlcm4gTVlTUUxfUExVR0lOX0lNUE9SVCBJX0xpc3Q8VEhEPiB0aHJlYWRzOworZXh0ZXJuIElf
TGlzdDxUSEQ+IHRocmVhZHM7CiBleHRlcm4gY2hhciBlcnJfc2hhcmVkX2RpcltdOwogZXh0ZXJu
IFRZUEVMSUIgdGhyZWFkX2hhbmRsaW5nX3R5cGVsaWI7CiBleHRlcm4gbXlfZGVjaW1hbCBkZWNp
bWFsX3plcm87CkBAIC0yODYsOSArMjg2LDcgQEAgZXh0ZXJuIFBTSV9jb25kX2tleSBrZXlfUkVM
QVlMT0dfdXBkYXRlXwogCiBleHRlcm4gUFNJX3RocmVhZF9rZXkga2V5X3RocmVhZF9ib290c3Ry
YXAsIGtleV90aHJlYWRfZGVsYXllZF9pbnNlcnQsCiAgIGtleV90aHJlYWRfaGFuZGxlX21hbmFn
ZXIsIGtleV90aHJlYWRfa2lsbF9zZXJ2ZXIsIGtleV90aHJlYWRfbWFpbiwKLSAga2V5X3RocmVh
ZF9zaWduYWxfaGFuZDsKLQotZXh0ZXJuIE1ZU1FMX1BMVUdJTl9JTVBPUlQgUFNJX3RocmVhZF9r
ZXkga2V5X3RocmVhZF9vbmVfY29ubmVjdGlvbjsKKyAga2V5X3RocmVhZF9vbmVfY29ubmVjdGlv
biwga2V5X3RocmVhZF9zaWduYWxfaGFuZDsKIAogI2lmZGVmIEhBVkVfTU1BUAogZXh0ZXJuIFBT
SV9maWxlX2tleSBrZXlfZmlsZV9tYXA7CkBAIC00NjYsNyArNDY0LDcgQEAgZXh0ZXJuIG15c3Fs
X211dGV4X3QgTE9DS19zZXJ2ZXJfc3RhcnRlZAogZXh0ZXJuIG15c3FsX2NvbmRfdCBDT05EX3Nl
cnZlcl9zdGFydGVkOwogZXh0ZXJuIG15c3FsX3J3bG9ja190IExPQ0tfZ3JhbnQsIExPQ0tfc3lz
X2luaXRfY29ubmVjdCwgTE9DS19zeXNfaW5pdF9zbGF2ZTsKIGV4dGVybiBteXNxbF9yd2xvY2tf
dCBMT0NLX3N5c3RlbV92YXJpYWJsZXNfaGFzaDsKLWV4dGVybiBNWVNRTF9QTFVHSU5fSU1QT1JU
IG15c3FsX2NvbmRfdCBDT05EX3RocmVhZF9jb3VudDsKK2V4dGVybiBteXNxbF9jb25kX3QgQ09O
RF90aHJlYWRfY291bnQ7CiBleHRlcm4gbXlzcWxfY29uZF90IENPTkRfbWFuYWdlcjsKIGV4dGVy
biBpbnQzMiB0aHJlYWRfcnVubmluZzsKIGV4dGVybiBteV9hdG9taWNfcndsb2NrX3QgdGhyZWFk
X3J1bm5pbmdfbG9jazsKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWls
cyku