From: marko.makela
Date: August 10 2011 10:51am
Subject: bzr push into mysql-5.5 branch (marko.makela:3488)
List-Archive: http://lists.mysql.com/commits/140571
Message-Id: <201108101051.p7AApjKI019475@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM0ODggTWFya28gTcOka2Vsw6QJMjAxMS0wOC0xMCBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20g
bXlzcWwtNS41IHRvIGxvY2FsIHRyZWUuCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3Vp
dGUvc3lzX3ZhcnMvci9pbm5vZGJfZmlsZV9mb3JtYXRfbWF4X2Jhc2ljLnJlc3VsdAogICAgICBt
eXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX3JvbGxiYWNrX3NlZ21lbnRzX2Jhc2lj
LnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192YXJzL3IvaW5ub2RiX3N0YXRzX21l
dGhvZF9iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9k
Yl9maWxlX2Zvcm1hdF9tYXhfYmFzaWMudGVzdAogICAgICBteXNxbC10ZXN0L3N1aXRlL3N5c192
YXJzL3QvaW5ub2RiX3JvbGxiYWNrX3NlZ21lbnRzX2Jhc2ljLnRlc3QKICAgICAgbXlzcWwtdGVz
dC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9zdGF0c19tZXRob2RfYmFzaWMudGVzdAogICAgbW9k
aWZpZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvc3lzX3ZhcnMvci9hbGxfdmFycy5yZXN1bHQK
ICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy9yL2lubm9kYl9maWxlX2Zvcm1hdF9jaGVj
a19iYXNpYy5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9zeXNfdmFycy90L2lubm9kYl9m
aWxlX2Zvcm1hdF9jaGVja19iYXNpYy50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL3Jvdy9yb3cwc2VsLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwu
YwlyZXZpZDp2aW5heS5maXNyZWthckBvcmFjbGUuY29tLTIwMTEwODEwMTAyMDQ4LXc4OXJwbXh5
OWJob20zNXUKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jCXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwODEwMTA1MDI3LWtwMWpjNDcwdWhjczExZWIKQEAgLTI1
NDEsNiArMjU0MSw4IEBAIHJvd19zZWxfZmllbGRfc3RvcmVfaW5fbXlzcWxfZm9ybWF0KAogCiAJ
dXRfYWQobGVuICE9IFVOSVZfU1FMX05VTEwpOwogCVVOSVZfTUVNX0FTU0VSVF9SVyhkYXRhLCBs
ZW4pOworCVVOSVZfTUVNX0FTU0VSVF9XKGRlc3QsIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKKwlV
TklWX01FTV9JTlZBTElEKGRlc3QsIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKIAogCXN3aXRjaCAo
dGVtcGwtPnR5cGUpIHsKIAkJY29uc3QgYnl0ZSoJZmllbGRfZW5kOwpAQCAtMjU3OSwxNCArMjU4
MSwxNiBAQCByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdCgKIAogCQkJZGVzdCA9
IHJvd19teXNxbF9zdG9yZV90cnVlX3Zhcl9sZW4oCiAJCQkJZGVzdCwgbGVuLCB0ZW1wbC0+bXlz
cWxfbGVuZ3RoX2J5dGVzKTsKKwkJCS8qIENvcHkgdGhlIGFjdHVhbCBkYXRhLiBMZWF2ZSB0aGUg
cmVzdCBvZiB0aGUKKwkJCWJ1ZmZlciB1bmluaXRpYWxpemVkLiAqLworCQkJbWVtY3B5KGRlc3Qs
IGRhdGEsIGxlbik7CisJCQlicmVhazsKIAkJfQogCiAJCS8qIENvcHkgdGhlIGFjdHVhbCBkYXRh
ICovCiAJCXV0X21lbWNweShkZXN0LCBkYXRhLCBsZW4pOwogCi0JCS8qIFBhZCB3aXRoIHRyYWls
aW5nIHNwYWNlcy4gV2UgcGFkIHdpdGggc3BhY2VzIGFsc28gdGhlCi0JCXVudXNlZCBlbmQgb2Yg
YSA+PSA1LjAuMyB0cnVlIFZBUkNIQVIgY29sdW1uLCBqdXN0IGluIGNhc2UKLQkJTXlTUUwgZXhw
ZWN0cyBpdHMgY29udGVudHMgdG8gYmUgZGV0ZXJtaW5pc3RpYy4gKi8KKwkJLyogUGFkIHdpdGgg
dHJhaWxpbmcgc3BhY2VzLiAqLwogCiAJCXBhZCA9IGRlc3QgKyBsZW47CiAKQEAgLTMxMTMsNiAr
MzExNywzOSBAQCBzZWxfcmVzdG9yZV9wb3NpdGlvbl9mb3JfbXlzcWwoCiB9CiAKIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8vKioKK0NvcGllcyBhIGNhY2hlZCBmaWVsZCBmb3IgTXlTUUwgZnJvbSB0aGUgZmV0Y2gg
Y2FjaGUuICovCitzdGF0aWMKK3ZvaWQKK3Jvd19zZWxfY29weV9jYWNoZWRfZmllbGRfZm9yX215
c3FsKAorLyo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSovCisJYnl0ZSoJCQlidWYs
CS8qITwgaW4vb3V0OiByb3cgYnVmZmVyICovCisJY29uc3QgYnl0ZSoJCWNhY2hlLAkvKiE8IGlu
OiBjYWNoZWQgcm93ICovCisJY29uc3QgbXlzcWxfcm93X3RlbXBsX3QqdGVtcGwpCS8qITwgaW46
IGNvbHVtbiB0ZW1wbGF0ZSAqLworeworCXVsaW50CWxlbjsKKworCWJ1ZiArPSB0ZW1wbC0+bXlz
cWxfY29sX29mZnNldDsKKwljYWNoZSArPSB0ZW1wbC0+bXlzcWxfY29sX29mZnNldDsKKworCVVO
SVZfTUVNX0FTU0VSVF9XKGJ1ZiwgdGVtcGwtPm15c3FsX2NvbF9sZW4pOworCisJaWYgKHRlbXBs
LT5teXNxbF90eXBlID09IERBVEFfTVlTUUxfVFJVRV9WQVJDSEFSCisJICAgICYmIHRlbXBsLT50
eXBlICE9IERBVEFfSU5UKSB7CisJCS8qIENoZWNrIGZvciAhPSBEQVRBX0lOVCB0byBtYWtlIHN1
cmUgd2UgZG8KKwkJbm90IHRyZWF0IE15U1FMIEVOVU0gb3IgU0VUIGFzIGEgdHJ1ZSBWQVJDSEFS
IQorCQlGaW5kIHRoZSBhY3R1YWwgbGVuZ3RoIG9mIHRoZSB0cnVlIFZBUkNIQVIgZmllbGQuICov
CisJCXJvd19teXNxbF9yZWFkX3RydWVfdmFyY2hhcigKKwkJCSZsZW4sIGNhY2hlLCB0ZW1wbC0+
bXlzcWxfbGVuZ3RoX2J5dGVzKTsKKwkJbGVuICs9IHRlbXBsLT5teXNxbF9sZW5ndGhfYnl0ZXM7
CisJCVVOSVZfTUVNX0lOVkFMSUQoYnVmLCB0ZW1wbC0+bXlzcWxfY29sX2xlbik7CisJfSBlbHNl
IHsKKwkJbGVuID0gdGVtcGwtPm15c3FsX2NvbF9sZW47CisJfQorCisJdXRfbWVtY3B5KGJ1Ziwg
Y2FjaGUsIGxlbik7Cit9CisKKy8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIFBvcHMgYSBjYWNoZWQgcm93IGZv
ciBNeVNRTCBmcm9tIHRoZSBmZXRjaCBjYWNoZS4gKi8KIFVOSVZfSU5MSU5FCiB2b2lkCkBAIC0z
MTI0LDI2ICszMTYxLDIyIEBAIHJvd19zZWxfcG9wX2NhY2hlZF9yb3dfZm9yX215c3FsKAogewog
CXVsaW50CQkJaTsKIAljb25zdCBteXNxbF9yb3dfdGVtcGxfdCp0ZW1wbDsKLQlieXRlKgkJCWNh
Y2hlZF9yZWM7CisJY29uc3QgYnl0ZSoJCWNhY2hlZF9yZWM7CiAJdXRfYWQocHJlYnVpbHQtPm5f
ZmV0Y2hfY2FjaGVkID4gMCk7CiAJdXRfYWQocHJlYnVpbHQtPm15c3FsX3ByZWZpeF9sZW4gPD0g
cHJlYnVpbHQtPm15c3FsX3Jvd19sZW4pOwogCisJVU5JVl9NRU1fQVNTRVJUX1coYnVmLCBwcmVi
dWlsdC0+bXlzcWxfcm93X2xlbik7CisKKwljYWNoZWRfcmVjID0gcHJlYnVpbHQtPmZldGNoX2Nh
Y2hlW3ByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdF07CisKIAlpZiAoVU5JVl9VTkxJS0VMWShw
cmVidWlsdC0+a2VlcF9vdGhlcl9maWVsZHNfb25fa2V5cmVhZCkpIHsKIAkJLyogQ29weSBjYWNo
ZSByZWNvcmQgZmllbGQgYnkgZmllbGQsIGRvbid0IHRvdWNoIGZpZWxkcyB0aGF0CiAJCWFyZSBu
b3QgY292ZXJlZCBieSBjdXJyZW50IGtleSAqLwotCQljYWNoZWRfcmVjID0gcHJlYnVpbHQtPmZl
dGNoX2NhY2hlWwotCQkJcHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0XTsKIAogCQlmb3IgKGkg
PSAwOyBpIDwgcHJlYnVpbHQtPm5fdGVtcGxhdGU7IGkrKykgewogCQkJdGVtcGwgPSBwcmVidWls
dC0+bXlzcWxfdGVtcGxhdGUgKyBpOwotI2lmIDAgLyogU29tZSBvZiB0aGUgY2FjaGVkX3JlYyBt
YXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6ZWQuICovCi0JCQlVTklWX01FTV9BU1NFUlRf
UlcoY2FjaGVkX3JlYwotCQkJCQkgICArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAotCQkJCQkg
ICB0ZW1wbC0+bXlzcWxfY29sX2xlbik7Ci0jZW5kaWYKLQkJCXV0X21lbWNweShidWYgKyB0ZW1w
bC0+bXlzcWxfY29sX29mZnNldCwKLQkJCQkgIGNhY2hlZF9yZWMgKyB0ZW1wbC0+bXlzcWxfY29s
X29mZnNldCwKLQkJCQkgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKKwkJCXJvd19zZWxfY29weV9j
YWNoZWRfZmllbGRfZm9yX215c3FsKAorCQkJCWJ1ZiwgY2FjaGVkX3JlYywgdGVtcGwpOwogCQkJ
LyogQ29weSBOVUxMIGJpdCBvZiB0aGUgY3VycmVudCBmaWVsZCBmcm9tIGNhY2hlZF9yZWMKIAkJ
CXRvIGJ1ZiAqLwogCQkJaWYgKHRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrKSB7CkBAIC0zMTUz
LDE3ICszMTg2LDI0IEBAIHJvd19zZWxfcG9wX2NhY2hlZF9yb3dfZm9yX215c3FsKAogCQkJCQkm
IChieXRlKXRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrOwogCQkJfQogCQl9CisJfSBlbHNlIGlm
IChwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbiA+IDYzKSB7CisJCS8qIFRoZSByZWNvcmQgaXMg
bG9uZy4gQ29weSBpdCBmaWVsZCBieSBmaWVsZCwgaW4gY2FzZQorCQl0aGVyZSBhcmUgc29tZSBs
b25nIFZBUkNIQVIgY29sdW1uIG9mIHdoaWNoIG9ubHkgYQorCQlzbWFsbCBsZW5ndGggaXMgYmVp
bmcgdXNlZC4gKi8KKwkJVU5JVl9NRU1fSU5WQUxJRChidWYsIHByZWJ1aWx0LT5teXNxbF9wcmVm
aXhfbGVuKTsKKworCQkvKiBGaXJzdCBjb3B5IHRoZSBOVUxMIGJpdHMuICovCisJCXV0X21lbWNw
eShidWYsIGNhY2hlZF9yZWMsIHByZWJ1aWx0LT5udWxsX2JpdG1hcF9sZW4pOworCQkvKiBUaGVu
IGNvcHkgdGhlIHJlcXVlc3RlZCBmaWVsZHMuICovCisKKwkJZm9yIChpID0gMDsgaSA8IHByZWJ1
aWx0LT5uX3RlbXBsYXRlOyBpKyspIHsKKwkJCXJvd19zZWxfY29weV9jYWNoZWRfZmllbGRfZm9y
X215c3FsKAorCQkJCWJ1ZiwgY2FjaGVkX3JlYywgcHJlYnVpbHQtPm15c3FsX3RlbXBsYXRlICsg
aSk7CisJCX0KKwl9IGVsc2UgeworCQl1dF9tZW1jcHkoYnVmLCBjYWNoZWRfcmVjLCBwcmVidWls
dC0+bXlzcWxfcHJlZml4X2xlbik7CiAJfQotCWVsc2UgewotI2lmIDAgLyogU29tZSBvZiB0aGUg
Y2FjaGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6ZWQuICovCi0JCVVOSVZf
TUVNX0FTU0VSVF9SVyhwcmVidWlsdC0+ZmV0Y2hfY2FjaGUKLQkJCQkgICBbcHJlYnVpbHQtPmZl
dGNoX2NhY2hlX2ZpcnN0XSwKLQkJCQkgICBwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbik7Ci0j
ZW5kaWYKLQkJdXRfbWVtY3B5KGJ1ZiwKLQkJCSAgcHJlYnVpbHQtPmZldGNoX2NhY2hlW3ByZWJ1
aWx0LT5mZXRjaF9jYWNoZV9maXJzdF0sCi0JCQkgIHByZWJ1aWx0LT5teXNxbF9wcmVmaXhfbGVu
KTsKLQl9CisKIAlwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWQtLTsKIAlwcmVidWlsdC0+ZmV0Y2hf
Y2FjaGVfZmlyc3QrKzsKIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1h
aWxzKS4=