From: marko.makela
Date: August 10 2011 10:43am
Subject: bzr push into mysql-trunk branch (marko.makela:3351 to 3352)
List-Archive: http://lists.mysql.com/commits/140567
Message-Id: <201108101043.p7AAhU27003447@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMzNTIgTWFya28gTcOka2Vsw6QJMjAxMS0wOC0xMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9yb3cvcm93MHNlbC5jCiAzMzUxIE1hcmMgQWxmZgkyMDExLTA4LTA5CiAgICAgIEJ1ZyMxMjM0
NjIxMSAtIFBFUkYgSU1QQUNUIE9GIFBFUkZPUk1BTkNFLVNDSEVNQSBXSVRIIERJU0FCTEVEIElO
U1RSVU1FTlRTL0NPTlNVTUVSUwogICAgICAKICAgICAgUGVyZm9ybWFuY2UgaW1wcm92ZW1lbnQg
IzM6IEJldHRlciBhbGxvY2F0aW9uLgogICAgICAKICAgICAgQmVmb3JlIHRoaXMgZml4LCB0aGUg
cGVyZm9ybWFuY2Ugc2NoZW1hIGFsbG9jYXRpb24gYWxnb3JpdGhtIHVzZWQsCiAgICAgIGZvciBl
eGFtcGxlIHdoZW4gY3JlYXRpbmcgYSBtdXRleCwgd2FzOgogICAgICAtIGNvbXB1dGUgYSByYW5k
b20gbnVtYmVyIEkgYmV0d2VlbiAwIGFuZCBOCiAgICAgIC0gc3RhcnQgdG8gc2NhbiBmb3IgYW4g
ZW1wdHkgc2xvdCBhdCBwb3NpdGlvbiBJIG1vZHVsbyBOLAogICAgICAgSSsxIG1vZHVsbyBOLCBJ
KzIgbW9kdWxvIE4gLi4uCiAgICAgIGFuZCB0aGlzIGZvciBlYWNoIGNvbXBldGluZyB0aHJlYWQu
CiAgICAgIAogICAgICBXaGVuIG9ubHkgYSBmZXcgdGhyZWFkcyBhcmUgcnVubmluZywgYW5kIHdo
ZW4gdGhlIHNsb3RzIGFyZSBtb3N0bHkgZW1wdHksCiAgICAgIHRoaXMgd29ya3Mgd2VsbCBzaW5j
ZSBmZXcgY29sbGlzaW9ucyBoYXBwZW4uCiAgICAgIAogICAgICBXaGVuIHRoZSBudW1iZXIgb2Yg
Y29tcGV0aW5nIHRocmVhZHMgYXVnbWVudHMsIGFuZCB3aGVuIHRoZSBzbG90cyBhcmUgbW9zdGx5
CiAgICAgIG9jY3VwaWVkLCB0aGlzIGNvZGUgY2FuIHBvdGVudGlhbGx5IGNyZWF0ZSBhIGxvdCBv
ZiBjb21wZXRpdGlvbiBiZXR3ZWVuCiAgICAgIHRocmVhZHMsIHdoZW4gZG9pbmcgYXRvbWljIG9w
ZXJhdGlvbnMgYWdhaW5zdCBlYWNoIHNsb3QgaW50ZXJuYWwgbG9jay4KICAgICAgCiAgICAgIFdp
dGggdGhpcyBmaXgsIHRoZSBhbGxvY2F0aW9uIGlzIGNoYW5nZWQgdG86CiAgICAgIC0ga2VlcCBh
IHN0YXRpYyBtb25vdG9uaWMgY291bnRlciBmb3IgZWFjaCBidWZmZXIsIEkKICAgICAgLSBhdG9t
aWNhbGx5IGluY3JlbWVudCBJCiAgICAgIC0gbG9vayBmb3IgYW4gZW1wdHkgc2xvdCBhdCBJIG1v
ZHVsbyBOCiAgICAgIC0gcmVwZWF0IGlmIG5lY2Vzc2FyeS4KICAgICAgCiAgICAgIEJlY2F1c2Ug
dGhlIG1vbm90b25pYyBjb3VudGVyIGlzIHNoYXJlZCBiZXR3ZWVuIGFsbCB0aHJlYWRzLAogICAg
ICBjb21wZXRpbmcgdGhyZWFkcyBlbmQgdXAgYWN0dWFsbHkgbG9va2luZyBmb3IgZGlmZmVyZW50
IHNsb3RzIGF0IEkwLCBJMCsxLAogICAgICBJMCsyIGV0Yywgd2hpY2ggcHJldmVudHMgY29tcGV0
aXRpb24gb24gZWFjaCBzbG90IGludGVybmFsIGxvY2suCiAgICAgIEFsc28sIGJlY2F1c2UgcmVj
b3JkcyBhcmUgYWxsb2NhdGVkIGluIGNpcmN1bGFyIGZhc2hpb24sIHN0YXJ0aW5nIHRvIGxvb2sK
ICAgICAgZm9yIGFuIGVtcHR5IHNsb3QgYWZ0ZXIgdGhlIGxhc3Qgc2xvdCBmb3VuZCBpbmNyZWFz
ZXMgdGhlIHByb2JhYmlsaXR5IHRvCiAgICAgIGZpbmQgYXZhaWxhYmxlIHNsb3RzLCBhbmQgcmVk
dWNlcyB0aGUgbnVtYmVyIG9mIGxvb3BzIGR1cmluZyB0aGUgc2Nhbi4KICAgICAgCiAgICAgIFdo
aWxlIGRpZmZpY3VsdCB0byBtZWFzdXJlLCB0aGlzIGZpeCBpcyBleHBlY3RlZCB0byBpbXByb3Zl
IHRoZSBzY2FsYWJpbGl0eQogICAgICBvZiB0aGUgcGVyZm9ybWFuY2Ugc2NoZW1hIGFsbG9jYXRp
b24gY29kZSwgd2hpY2ggaXMgdXNlZCBmb3I6CiAgICAgIC0gY3JlYXRpbmcgYSBtdXRleCwKICAg
ICAgLSBjcmVhdGluZyBhIHJ3bG9jaywKICAgICAgLSBjcmVhdGluZyBhIGNvbmQsCiAgICAgIC0g
b3BlbmluZyBhIGZpbGUsCiAgICAgIC0gb3BlbmluZyBhIHRhYmxlCiAgICAgIHdoaWNoIGFyZSBh
bGwgb3BlcmF0aW9ucyB0aGF0IGNhbiBvY2N1ciBmcmVxdWVudGx5IHdoZW4gdGhlIHNlcnZlciBp
cwogICAgICBydW5uaW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL3BlcmZzY2hlbWEv
cGZzX2luc3RyLmNjCiAgICAgIHN0b3JhZ2UvcGVyZnNjaGVtYS9wZnNfaW5zdHJfY2xhc3MuY2MK
ICAgICAgc3RvcmFnZS9wZXJmc2NoZW1hL3Bmc19zZXR1cF9hY3Rvci5jYwogICAgICBzdG9yYWdl
L3BlcmZzY2hlbWEvcGZzX3NldHVwX29iamVjdC5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cw
c2VsLmMJcmV2aWQ6bWFyYy5hbGZmQG9yYWNsZS5jb20tMjAxMTA4MDkxNjM5MTYtNzh6aWw2N3h4
cGg2bHVxdworKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTA4MTAxMDA3NDktbG11eXVibDc2MmtrZHVjNApAQCAtMjU3
NCw2ICsyNTc0LDggQEAgcm93X3NlbF9maWVsZF9zdG9yZV9pbl9teXNxbF9mb3JtYXRfZnVuYwog
CiAJdXRfYWQobGVuICE9IFVOSVZfU1FMX05VTEwpOwogCVVOSVZfTUVNX0FTU0VSVF9SVyhkYXRh
LCBsZW4pOworCVVOSVZfTUVNX0FTU0VSVF9XKGRlc3QsIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsK
KwlVTklWX01FTV9JTlZBTElEKGRlc3QsIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKIAogCXN3aXRj
aCAodGVtcGwtPnR5cGUpIHsKIAkJY29uc3QgYnl0ZSoJZmllbGRfZW5kOwpAQCAtMjYxMiwxNCAr
MjYxNCwxNiBAQCByb3dfc2VsX2ZpZWxkX3N0b3JlX2luX215c3FsX2Zvcm1hdF9mdW5jCiAKIAkJ
CWRlc3QgPSByb3dfbXlzcWxfc3RvcmVfdHJ1ZV92YXJfbGVuKAogCQkJCWRlc3QsIGxlbiwgdGVt
cGwtPm15c3FsX2xlbmd0aF9ieXRlcyk7CisJCQkvKiBDb3B5IHRoZSBhY3R1YWwgZGF0YS4gTGVh
dmUgdGhlIHJlc3Qgb2YgdGhlCisJCQlidWZmZXIgdW5pbml0aWFsaXplZC4gKi8KKwkJCW1lbWNw
eShkZXN0LCBkYXRhLCBsZW4pOworCQkJYnJlYWs7CiAJCX0KIAogCQkvKiBDb3B5IHRoZSBhY3R1
YWwgZGF0YSAqLwogCQl1dF9tZW1jcHkoZGVzdCwgZGF0YSwgbGVuKTsKIAotCQkvKiBQYWQgd2l0
aCB0cmFpbGluZyBzcGFjZXMuIFdlIHBhZCB3aXRoIHNwYWNlcyBhbHNvIHRoZQotCQl1bnVzZWQg
ZW5kIG9mIGEgPj0gNS4wLjMgdHJ1ZSBWQVJDSEFSIGNvbHVtbiwganVzdCBpbiBjYXNlCi0JCU15
U1FMIGV4cGVjdHMgaXRzIGNvbnRlbnRzIHRvIGJlIGRldGVybWluaXN0aWMuICovCisJCS8qIFBh
ZCB3aXRoIHRyYWlsaW5nIHNwYWNlcy4gKi8KIAogCQlwYWQgPSBkZXN0ICsgbGVuOwogCkBAIC0z
MjI3LDYgKzMyMzEsMzkgQEAgc2VsX3Jlc3RvcmVfcG9zaXRpb25fZm9yX215c3FsKAogfQogCiAv
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovLyoqCitDb3BpZXMgYSBjYWNoZWQgZmllbGQgZm9yIE15U1FMIGZyb20gdGhl
IGZldGNoIGNhY2hlLiAqLworc3RhdGljCit2b2lkCityb3dfc2VsX2NvcHlfY2FjaGVkX2ZpZWxk
X2Zvcl9teXNxbCgKKy8qPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0qLworCWJ5dGUq
CQkJYnVmLAkvKiE8IGluL291dDogcm93IGJ1ZmZlciAqLworCWNvbnN0IGJ5dGUqCQljYWNoZSwJ
LyohPCBpbjogY2FjaGVkIHJvdyAqLworCWNvbnN0IG15c3FsX3Jvd190ZW1wbF90KnRlbXBsKQkv
KiE8IGluOiBjb2x1bW4gdGVtcGxhdGUgKi8KK3sKKwl1bGludAlsZW47CisKKwlidWYgKz0gdGVt
cGwtPm15c3FsX2NvbF9vZmZzZXQ7CisJY2FjaGUgKz0gdGVtcGwtPm15c3FsX2NvbF9vZmZzZXQ7
CisKKwlVTklWX01FTV9BU1NFUlRfVyhidWYsIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKKworCWlm
ICh0ZW1wbC0+bXlzcWxfdHlwZSA9PSBEQVRBX01ZU1FMX1RSVUVfVkFSQ0hBUgorCSAgICAmJiB0
ZW1wbC0+dHlwZSAhPSBEQVRBX0lOVCkgeworCQkvKiBDaGVjayBmb3IgIT0gREFUQV9JTlQgdG8g
bWFrZSBzdXJlIHdlIGRvCisJCW5vdCB0cmVhdCBNeVNRTCBFTlVNIG9yIFNFVCBhcyBhIHRydWUg
VkFSQ0hBUiEKKwkJRmluZCB0aGUgYWN0dWFsIGxlbmd0aCBvZiB0aGUgdHJ1ZSBWQVJDSEFSIGZp
ZWxkLiAqLworCQlyb3dfbXlzcWxfcmVhZF90cnVlX3ZhcmNoYXIoCisJCQkmbGVuLCBjYWNoZSwg
dGVtcGwtPm15c3FsX2xlbmd0aF9ieXRlcyk7CisJCWxlbiArPSB0ZW1wbC0+bXlzcWxfbGVuZ3Ro
X2J5dGVzOworCQlVTklWX01FTV9JTlZBTElEKGJ1ZiwgdGVtcGwtPm15c3FsX2NvbF9sZW4pOwor
CX0gZWxzZSB7CisJCWxlbiA9IHRlbXBsLT5teXNxbF9jb2xfbGVuOworCX0KKworCXV0X21lbWNw
eShidWYsIGNhY2hlLCBsZW4pOworfQorCisvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBQb3BzIGEgY2FjaGVk
IHJvdyBmb3IgTXlTUUwgZnJvbSB0aGUgZmV0Y2ggY2FjaGUuICovCiBVTklWX0lOTElORQogdm9p
ZApAQCAtMzIzOCwyNiArMzI3NSwyMiBAQCByb3dfc2VsX2RlcXVldWVfY2FjaGVkX3Jvd19mb3Jf
bXlzcWwoCiB7CiAJdWxpbnQJCQlpOwogCWNvbnN0IG15c3FsX3Jvd190ZW1wbF90KnRlbXBsOwot
CWJ5dGUqCQkJY2FjaGVkX3JlYzsKKwljb25zdCBieXRlKgkJY2FjaGVkX3JlYzsKIAl1dF9hZChw
cmVidWlsdC0+bl9mZXRjaF9jYWNoZWQgPiAwKTsKIAl1dF9hZChwcmVidWlsdC0+bXlzcWxfcHJl
Zml4X2xlbiA8PSBwcmVidWlsdC0+bXlzcWxfcm93X2xlbik7CiAKKwlVTklWX01FTV9BU1NFUlRf
VyhidWYsIHByZWJ1aWx0LT5teXNxbF9yb3dfbGVuKTsKKworCWNhY2hlZF9yZWMgPSBwcmVidWls
dC0+ZmV0Y2hfY2FjaGVbcHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0XTsKKwogCWlmIChVTklW
X1VOTElLRUxZKHByZWJ1aWx0LT5rZWVwX290aGVyX2ZpZWxkc19vbl9rZXlyZWFkKSkgewogCQkv
KiBDb3B5IGNhY2hlIHJlY29yZCBmaWVsZCBieSBmaWVsZCwgZG9uJ3QgdG91Y2ggZmllbGRzIHRo
YXQKIAkJYXJlIG5vdCBjb3ZlcmVkIGJ5IGN1cnJlbnQga2V5ICovCi0JCWNhY2hlZF9yZWMgPSBw
cmVidWlsdC0+ZmV0Y2hfY2FjaGVbCi0JCQlwcmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3RdOwog
CiAJCWZvciAoaSA9IDA7IGkgPCBwcmVidWlsdC0+bl90ZW1wbGF0ZTsgaSsrKSB7CiAJCQl0ZW1w
bCA9IHByZWJ1aWx0LT5teXNxbF90ZW1wbGF0ZSArIGk7Ci0jaWYgMCAvKiBTb21lIG9mIHRoZSBj
YWNoZWRfcmVjIG1heSBsZWdpdGltYXRlbHkgYmUgdW5pbml0aWFsaXplZC4gKi8KLQkJCVVOSVZf
TUVNX0FTU0VSVF9SVyhjYWNoZWRfcmVjCi0JCQkJCSAgICsgdGVtcGwtPm15c3FsX2NvbF9vZmZz
ZXQsCi0JCQkJCSAgIHRlbXBsLT5teXNxbF9jb2xfbGVuKTsKLSNlbmRpZgotCQkJdXRfbWVtY3B5
KGJ1ZiArIHRlbXBsLT5teXNxbF9jb2xfb2Zmc2V0LAotCQkJCSAgY2FjaGVkX3JlYyArIHRlbXBs
LT5teXNxbF9jb2xfb2Zmc2V0LAotCQkJCSAgdGVtcGwtPm15c3FsX2NvbF9sZW4pOworCQkJcm93
X3NlbF9jb3B5X2NhY2hlZF9maWVsZF9mb3JfbXlzcWwoCisJCQkJYnVmLCBjYWNoZWRfcmVjLCB0
ZW1wbCk7CiAJCQkvKiBDb3B5IE5VTEwgYml0IG9mIHRoZSBjdXJyZW50IGZpZWxkIGZyb20gY2Fj
aGVkX3JlYwogCQkJdG8gYnVmICovCiAJCQlpZiAodGVtcGwtPm15c3FsX251bGxfYml0X21hc2sp
IHsKQEAgLTMyNjcsMTcgKzMzMDAsMjQgQEAgcm93X3NlbF9kZXF1ZXVlX2NhY2hlZF9yb3dfZm9y
X215c3FsKAogCQkJCQkmIChieXRlKXRlbXBsLT5teXNxbF9udWxsX2JpdF9tYXNrOwogCQkJfQog
CQl9CisJfSBlbHNlIGlmIChwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbiA+IDYzKSB7CisJCS8q
IFRoZSByZWNvcmQgaXMgbG9uZy4gQ29weSBpdCBmaWVsZCBieSBmaWVsZCwgaW4gY2FzZQorCQl0
aGVyZSBhcmUgc29tZSBsb25nIFZBUkNIQVIgY29sdW1uIG9mIHdoaWNoIG9ubHkgYQorCQlzbWFs
bCBsZW5ndGggaXMgYmVpbmcgdXNlZC4gKi8KKwkJVU5JVl9NRU1fSU5WQUxJRChidWYsIHByZWJ1
aWx0LT5teXNxbF9wcmVmaXhfbGVuKTsKKworCQkvKiBGaXJzdCBjb3B5IHRoZSBOVUxMIGJpdHMu
ICovCisJCXV0X21lbWNweShidWYsIGNhY2hlZF9yZWMsIHByZWJ1aWx0LT5udWxsX2JpdG1hcF9s
ZW4pOworCQkvKiBUaGVuIGNvcHkgdGhlIHJlcXVlc3RlZCBmaWVsZHMuICovCisKKwkJZm9yIChp
ID0gMDsgaSA8IHByZWJ1aWx0LT5uX3RlbXBsYXRlOyBpKyspIHsKKwkJCXJvd19zZWxfY29weV9j
YWNoZWRfZmllbGRfZm9yX215c3FsKAorCQkJCWJ1ZiwgY2FjaGVkX3JlYywgcHJlYnVpbHQtPm15
c3FsX3RlbXBsYXRlICsgaSk7CisJCX0KKwl9IGVsc2UgeworCQl1dF9tZW1jcHkoYnVmLCBjYWNo
ZWRfcmVjLCBwcmVidWlsdC0+bXlzcWxfcHJlZml4X2xlbik7CiAJfQotCWVsc2UgewotI2lmIDAg
LyogU29tZSBvZiB0aGUgY2FjaGVkX3JlYyBtYXkgbGVnaXRpbWF0ZWx5IGJlIHVuaW5pdGlhbGl6
ZWQuICovCi0JCVVOSVZfTUVNX0FTU0VSVF9SVyhwcmVidWlsdC0+ZmV0Y2hfY2FjaGUKLQkJCQkg
ICBbcHJlYnVpbHQtPmZldGNoX2NhY2hlX2ZpcnN0XSwKLQkJCQkgICBwcmVidWlsdC0+bXlzcWxf
cHJlZml4X2xlbik7Ci0jZW5kaWYKLQkJdXRfbWVtY3B5KGJ1ZiwKLQkJCSAgcHJlYnVpbHQtPmZl
dGNoX2NhY2hlW3ByZWJ1aWx0LT5mZXRjaF9jYWNoZV9maXJzdF0sCi0JCQkgIHByZWJ1aWx0LT5t
eXNxbF9wcmVmaXhfbGVuKTsKLQl9CisKIAlwcmVidWlsdC0+bl9mZXRjaF9jYWNoZWQtLTsKIAlw
cmVidWlsdC0+ZmV0Y2hfY2FjaGVfZmlyc3QrKzsKIAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxl
c3MgZm9yIHB1c2ggZW1haWxzKS4=