From: marko.makela
Date: June 30 2011 10:55am
Subject: bzr push into mysql-trunk branch (marko.makela:3247 to 3248)
List-Archive: http://lists.mysql.com/commits/140118
Message-Id: <201106301055.p5UAtPUJ009293@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMyNDggTWFya28gTcOka2Vsw6QJMjAxMS0wNi0zMCBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNSB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5u
b2RiL3QvaW5ub2RiLWluZGV4LnRlc3QKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJv
dy5jCiAzMjQ3IFN1bm55IEJhaW5zCTIwMTEtMDYtMzAKICAgICAgV0wjNTkxNSAtIE1ha2UgZGVh
ZGxvY2sgZGV0ZWN0aW9uIG5vbi1yZWN1cnNpdmUuCiAgICAgIAogICAgICBUaGUgZXhwbGljaXQg
c3RhY2sgaXMgYWxsb2NhdGVkIGF0IHN0YXJ0dXAgYW5kIGZyZWVkIGF0IHNodXRkb3duLiBUaGUg
c3RhY2sKICAgICAgc2l6ZSBpcyBzZXQgdG8gT1NfVEhSRUFEX01BWF9OLiBJZiB3ZSByZWFjaCB0
aGlzIGxpbWl0IGR1cmluZyB0aGUgZGVhZGxvY2sKICAgICAgc2VhcmNoLiAgVGhlIGJvdW5kYXJ5
IGNvbmRpdGlvbiBpcyBmbGFnZ2VkIGFzIGEgInNlYXJjaCB0b28gZGVlcCIgZXJyb3IgYW5kCiAg
ICAgIHRoZSBqb2luaW5nIHRyYW5zYWN0aW9uIHRoYXQgaXMgcmVxdWVzdGluZyBhIGxvY2sgaW4g
YW4gaW5jb21wYXRpYmxlIG1vZGUgaXMKICAgICAgcm9sbGVkIGJhY2suICBUaGlzIGlzIHNpbWls
YXIgdG8gdGhlICJzZWFyY2ggdG9vIGRlZXAiIGJlaGF2aW91ciBvZiB0aGUKICAgICAgY3VycmVu
dCBhbGdvcml0aG0uIFRoaXMgcGF0Y2ggYWxzbyBwcmVzZXJ2ZXMgdGhlIG9sZCBiZWhhdmlvdXIg
b2YgInNlYXJjaAogICAgICB0b28gZGVlcCIgd2hlcmUgd2UgYWxzbyBjb3VudCB0aGUgbnVtYmVy
IG9mIG9wZXJhdGlvbnMuIFRoZSBvbGQgYmVoYXZpb3VyCiAgICAgIGlzIG5vdyByZWR1bmRhbnQg
YW5kIHdpbGwgYmUgcmVtb3ZlZCBpbiBhIGZ1dHVyZSB2ZXJzaW9uLgogICAgICAgIAogICAgICBy
YjovLzYxNyBBcHByb3ZlZCBieSBNYXJrby4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vYmFzZS9sb2NrL2xvY2swbG9jay5jCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3N1
aXRlL2lubm9kYi9yL2lubm9kYi1pbmRleC5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUv
aW5ub2RiL3IvaW5ub2RiLWluZGV4LnJlc3VsdAlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29t
LTIwMTEwNjMwMDU1MjUwLWU4c2x3cGp0NW4yY2FwcmQKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9p
bm5vZGIvci9pbm5vZGItaW5kZXgucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29t
LTIwMTEwNjMwMTAyODI2LTJjcDZmM2xscWNsbGRuZzIKQEAgLTkxNyw2ICs5MTcsMTkgQEAgRVJS
T1IgSFkwMDA6IFRvbyBiaWcgcm93CiBhbHRlciB0YWJsZSB0MSByb3dfZm9ybWF0PWNvbXBhY3Q7
CiBjcmVhdGUgaW5kZXggdDF1IG9uIHQxICh1KDc2NykpOwogZHJvcCB0YWJsZSB0MTsKK1NFVCBA
cj1SRVBFQVQoJ2EnLDUwMCk7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQsCit2MSBWQVJDSEFSKDUw
MCksIHYyIFZBUkNIQVIoNTAwKSwgdjMgVkFSQ0hBUig1MDApLAordjQgVkFSQ0hBUig1MDApLCB2
NSBWQVJDSEFSKDUwMCksIHY2IFZBUkNIQVIoNTAwKSwKK3Y3IFZBUkNIQVIoNTAwKSwgdjggVkFS
Q0hBUig1MDApLCB2OSBWQVJDSEFSKDUwMCksCit2MTAgVkFSQ0hBUig1MDApLCB2MTEgVkFSQ0hB
Uig1MDApLCB2MTIgVkFSQ0hBUig1MDApLAordjEzIFZBUkNIQVIoNTAwKSwgdjE0IFZBUkNIQVIo
NTAwKSwgdjE1IFZBUkNIQVIoNTAwKSwKK3YxNiBWQVJDSEFSKDUwMCksIHYxNyBWQVJDSEFSKDUw
MCksIHYxOCBWQVJDSEFSKDUwMCkKKykgRU5HSU5FPUlubm9EQiBST1dfRk9STUFUPURZTkFNSUM7
CitDUkVBVEUgSU5ERVggaWR4MSBPTiB0MShhLHYxKTsKK0lOU0VSVCBJTlRPIHQxIFZBTFVFUyg5
LEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByKTsK
K1VQREFURSB0MSBTRVQgYT0xMDAwOworRFJPUCBUQUJMRSB0MTsKIHNldCBnbG9iYWwgaW5ub2Ri
X2ZpbGVfcGVyX3RhYmxlPTA7CiBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX2Zvcm1hdD1BbnRlbG9w
ZTsKIHNldCBnbG9iYWwgaW5ub2RiX2ZpbGVfZm9ybWF0X21heD1BbnRlbG9wZTsKCj09PSBtb2Rp
ZmllZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0Jwot
LS0gYS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOnN1
bm55LmJhaW5zQG9yYWNsZS5jb20tMjAxMTA2MzAwNTUyNTAtZThzbHdwanQ1bjJjYXByZAorKysg
Yi9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYi1pbmRleC50ZXN0CXJldmlkOm1hcmtv
Lm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjMwMTAyODI2LTJjcDZmM2xscWNsbGRuZzIKQEAgLTM5
OSw2ICszOTksMjIgQEAgYWx0ZXIgdGFibGUgdDEgcm93X2Zvcm1hdD1jb21wYWN0OwogY3JlYXRl
IGluZGV4IHQxdSBvbiB0MSAodSg3NjcpKTsKIAogZHJvcCB0YWJsZSB0MTsKKworIyBCdWcjMTI2
Mzc3ODYKK1NFVCBAcj1SRVBFQVQoJ2EnLDUwMCk7CitDUkVBVEUgVEFCTEUgdDEoYSBJTlQsCisg
djEgVkFSQ0hBUig1MDApLCB2MiBWQVJDSEFSKDUwMCksIHYzIFZBUkNIQVIoNTAwKSwKKyB2NCBW
QVJDSEFSKDUwMCksIHY1IFZBUkNIQVIoNTAwKSwgdjYgVkFSQ0hBUig1MDApLAorIHY3IFZBUkNI
QVIoNTAwKSwgdjggVkFSQ0hBUig1MDApLCB2OSBWQVJDSEFSKDUwMCksCisgdjEwIFZBUkNIQVIo
NTAwKSwgdjExIFZBUkNIQVIoNTAwKSwgdjEyIFZBUkNIQVIoNTAwKSwKKyB2MTMgVkFSQ0hBUig1
MDApLCB2MTQgVkFSQ0hBUig1MDApLCB2MTUgVkFSQ0hBUig1MDApLAorIHYxNiBWQVJDSEFSKDUw
MCksIHYxNyBWQVJDSEFSKDUwMCksIHYxOCBWQVJDSEFSKDUwMCkKKykgRU5HSU5FPUlubm9EQiBS
T1dfRk9STUFUPURZTkFNSUM7CitDUkVBVEUgSU5ERVggaWR4MSBPTiB0MShhLHYxKTsKK0lOU0VS
VCBJTlRPIHQxIFZBTFVFUyg5LEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEByLEBy
LEByLEByLEByLEByLEByKTsKK1VQREFURSB0MSBTRVQgYT0xMDAwOworRFJPUCBUQUJMRSB0MTsK
KwogZXZhbCBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX3Blcl90YWJsZT0kcGVyX3RhYmxlOwogZXZh
bCBzZXQgZ2xvYmFsIGlubm9kYl9maWxlX2Zvcm1hdD0kZm9ybWF0OwogZXZhbCBzZXQgZ2xvYmFs
IGlubm9kYl9maWxlX2Zvcm1hdF9tYXg9JGZvcm1hdDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL3Jvdy9yb3cwcm93LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3Jv
dzByb3cuYwlyZXZpZDpzdW5ueS5iYWluc0BvcmFjbGUuY29tLTIwMTEwNjMwMDU1MjUwLWU4c2x3
cGp0NW4yY2FwcmQKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHJvdy5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwNjMwMTAyODI2LTJjcDZmM2xscWNsbGRuZzIKQEAg
LTEwMSwxMiArMTAxLDI3IEBAIHJvd19idWlsZF9pbmRleF9lbnRyeSgKIAogCQlkZmllbGRfY29w
eShkZmllbGQsIGRmaWVsZDIpOwogCi0JCWlmIChkZmllbGRfaXNfbnVsbChkZmllbGQpIHx8IGlu
ZF9maWVsZC0+cHJlZml4X2xlbiA9PSAwKSB7CisJCWlmIChkZmllbGRfaXNfbnVsbChkZmllbGQp
KSB7CiAJCQljb250aW51ZTsKIAkJfQogCi0JCS8qIElmIGEgY29sdW1uIHByZWZpeCBpbmRleCwg
dGFrZSBvbmx5IHRoZSBwcmVmaXguCi0JCVByZWZpeC1pbmRleGVkIGNvbHVtbnMgbWF5IGJlIGV4
dGVybmFsbHkgc3RvcmVkLiAqLworCQlpZiAoaW5kX2ZpZWxkLT5wcmVmaXhfbGVuID09IDAKKwkJ
ICAgICYmICghZGZpZWxkX2lzX2V4dChkZmllbGQpCisJCQl8fCBkaWN0X2luZGV4X2lzX2NsdXN0
KGluZGV4KSkpIHsKKwkJCS8qIFRoZSBkZmllbGRfY29weSgpIGFib3ZlIHN1ZmZpY2VzIGZvcgor
CQkJY29sdW1ucyB0aGF0IGFyZSBzdG9yZWQgaW4tcGFnZSwgb3IgZm9yCisJCQljbHVzdGVyZWQg
aW5kZXggcmVjb3JkIGNvbHVtbnMgdGhhdCBhcmUgbm90CisJCQlwYXJ0IG9mIGEgY29sdW1uIHBy
ZWZpeCBpbiB0aGUgUFJJTUFSWSBLRVkuICovCisJCQljb250aW51ZTsKKwkJfQorCisJCS8qIElm
IHRoZSBjb2x1bW4gaXMgc3RvcmVkIGV4dGVybmFsbHkgKG9mZi1wYWdlKSBpbgorCQl0aGUgY2x1
c3RlcmVkIGluZGV4LCBpdCBtdXN0IGJlIGFuIG9yZGVyaW5nIGZpZWxkIGluCisJCXRoZSBzZWNv
bmRhcnkgaW5kZXguICBJbiB0aGUgQW50ZWxvcGUgZm9ybWF0LCBvbmx5CisJCXByZWZpeC1pbmRl
eGVkIGNvbHVtbnMgbWF5IGJlIHN0b3JlZCBvZmYtcGFnZSBpbiB0aGUKKwkJY2x1c3RlcmVkIGlu
ZGV4IHJlY29yZC4gSW4gdGhlIEJhcnJhY3VkYSBmb3JtYXQsIGFsc28KKwkJZnVsbHkgaW5kZXhl
ZCBsb25nIENIQVIgb3IgVkFSQ0hBUiBjb2x1bW5zIG1heSBiZQorCQlzdG9yZWQgb2ZmLXBhZ2Uu
ICovCiAJCXV0X2FkKGNvbC0+b3JkX3BhcnQpOwogCiAJCWlmIChVTklWX0xJS0VMWV9OVUxMKGV4
dCkpIHsKQEAgLTExOSwxMSArMTM0LDMyIEBAIHJvd19idWlsZF9pbmRleF9lbnRyeSgKIAkJCQl9
CiAJCQkJZGZpZWxkX3NldF9kYXRhKGRmaWVsZCwgYnVmLCBsZW4pOwogCQkJfQorCisJCQlpZiAo
aW5kX2ZpZWxkLT5wcmVmaXhfbGVuID09IDApIHsKKwkJCQkvKiBJbiB0aGUgQmFycmFjdWRhIGZv
cm1hdAorCQkJCShST1dfRk9STUFUPURZTkFNSUMgb3IKKwkJCQlST1dfRk9STUFUPUNPTVBSRVNT
RUQpLCB3ZSBjYW4gaGF2ZSBhCisJCQkJc2Vjb25kYXJ5IGluZGV4IG9uIGFuIGVudGlyZSBjb2x1
bW4KKwkJCQl0aGF0IGlzIHN0b3JlZCBvZmYtcGFnZSBpbiB0aGUKKwkJCQljbHVzdGVyZWQgaW5k
ZXguIEFzIHRoaXMgaXMgbm90IGEKKwkJCQlwcmVmaXggaW5kZXggKHByZWZpeF9sZW4gPT0gMCks
CisJCQkJaW5jbHVkZSB0aGUgZW50aXJlIG9mZi1wYWdlIGNvbHVtbiBpbgorCQkJCXRoZSBzZWNv
bmRhcnkgaW5kZXggcmVjb3JkLiAqLworCQkJCWNvbnRpbnVlOworCQkJfQogCQl9IGVsc2UgaWYg
KGRmaWVsZF9pc19leHQoZGZpZWxkKSkgeworCQkJLyogVGhpcyB0YWJsZSBzaG91bGQgYmUgaW4g
QW50ZWxvcGUgZm9ybWF0CisJCQkoUk9XX0ZPUk1BVD1SRURVTkRBTlQgb3IgUk9XX0ZPUk1BVD1D
T01QQUNUKS4KKwkJCUluIHRoYXQgZm9ybWF0LCB0aGUgbWF4aW11bSBjb2x1bW4gcHJlZml4CisJ
CQlpbmRleCBsZW5ndGggaXMgNzY3IGJ5dGVzLCBhbmQgdGhlIGNsdXN0ZXJlZAorCQkJaW5kZXgg
cmVjb3JkIGNvbnRhaW5zIGEgNzY4LWJ5dGUgcHJlZml4IG9mCisJCQllYWNoIG9mZi1wYWdlIGNv
bHVtbi4gKi8KIAkJCXV0X2EobGVuID49IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkUpOwogCQkJ
bGVuIC09IEJUUl9FWFRFUk5fRklFTERfUkVGX1NJWkU7CiAJCX0KIAorCQkvKiBJZiBhIGNvbHVt
biBwcmVmaXggaW5kZXgsIHRha2Ugb25seSB0aGUgcHJlZml4LiAqLworCQl1dF9hZChpbmRfZmll
bGQtPnByZWZpeF9sZW4pOwogCQlsZW4gPSBkdHlwZV9nZXRfYXRfbW9zdF9uX21iY2hhcnMoCiAJ
CQljb2wtPnBydHlwZSwgY29sLT5tYm1pbm1heGxlbiwKIAkJCWluZF9maWVsZC0+cHJlZml4X2xl
biwgbGVuLCBkZmllbGRfZ2V0X2RhdGEoZGZpZWxkKSk7CgpObyBidW5kbGUgKHJlYXNvbjogdXNl
bGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==