From: marko.makela
Date: June 18 2012 8:44pm
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3987 to 3990) WL#6255
List-Archive: http://lists.mysql.com/commits/144258
Message-Id: <20120618204407.5548.33407.3990@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5OTAgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xOAogICAgICBXTCM2MjU1IHJldmlldyBmaXhl
cy4gQWRqdXN0IGNvbW1lbnRzIGFuZCBzaW1wbGlmeSBhbiAjaWZkZWYuCgogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjCiAgICAgIHN0
b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGRpY3QuaAogICAgICBzdG9yYWdlL2lubm9iYXNl
L2luY2x1ZGUvZGljdDBkaWN0LmljCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tZW0w
bWVtLmljCiAzOTg5IE1hcmtvIE3DpGtlbMOkCTIwMTItMDYtMTgKICAgICAgV0wjNjI1NSByZXZp
ZXcgZml4OiBDb3JyZWN0IGEgdHlwbyBpbiBhIGNvbW1lbnQuCgogICAgbW9kaWZpZWQ6CiAgICAg
IHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9yb3cwbWVyZ2UuaAogMzk4OCBNYXJrbyBNw6RrZWzD
pAkyMDEyLTA2LTE4CiAgICAgIFdMIzYyNTUgcmV2aWV3IGZpeDogQWRqdXN0IGEgY29tbWVudC4K
CiAgICBtb2RpZmllZDoKICAgICAgc3FsL3NxbF90YWJsZS5jYwogMzk4NyBNYXJrbyBNw6RrZWzD
pAkyMDEyLTA2LTE4CiAgICAgIFdMIzYyNTUgcmI6MTEwNSBQcm9ibGVtIDI4IGZpeC4KICAgICAg
CiAgICAgIGlubm9iYXNlX2J1aWxkX2NvbF9tYXAoKTogRG8gbm90IG92ZXJ3cml0ZSB0aGUgRlRT
X0RPQ19JRCBtYXBwaW5nLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hh
bmRsZXIvaGFuZGxlcjBhbHRlci5jYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3FsL3NxbF90YWJsZS5j
YycKLS0tIGEvc3FsL3NxbF90YWJsZS5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDYxODEyMjQ1MC0yOXBuMDV0ZDVoYXBkNzRjCisrKyBiL3NxbC9zcWxfdGFibGUuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTgyMDM0MTMtbnhtd2Q4MmJ4anczendl
OApAQCAtNTM3OSw3ICs1Mzc5LDggQEAgc3RhdGljIGJvb2wgZmlsbF9hbHRlcl9pbnBsYWNlX2lu
Zm8oVEhECiAgICovCiAgIGZvciAoZl9wdHI9IHRhYmxlLT5maWVsZDsgKGZpZWxkPSAqZl9wdHIp
OyBmX3B0cisrKQogICB7Ci0gICAgLyogQ2xlYXIgbWFya2VyIGZvciByZW5hbWVkIGZpZWxkIHdo
aWNoIHdlIGFyZSBnb2luZyB0byBzZXQgbGF0ZXIuICovCisgICAgLyogQ2xlYXIgbWFya2VyIGZv
ciByZW5hbWVkIG9yIGRyb3BwZWQgZmllbGQKKyAgICB3aGljaCB3ZSBhcmUgZ29pbmcgdG8gc2V0
IGxhdGVyLiAqLwogICAgIGZpZWxkLT5mbGFncyY9IH4oRklFTERfSVNfUkVOQU1FRCB8IEZJRUxE
X0lTX0RST1BQRUQpOwogCiAgICAgLyogVXNlIHRyYW5zZm9ybWVkIGluZm8gdG8gZXZhbHVhdGUg
ZmxhZ3MgZm9yIHN0b3JhZ2UgZW5naW5lLiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEyMDYxODEyMjQ1MC0yOXBuMDV0ZDVoYXBkNzRjCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaGFu
ZGxlci9oYW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIw
NjE4MjAzNDEzLW54bXdkODJieGp3M3p3ZTgKQEAgLTE5OTgsOCArMTk5OCw4IEBAIGNvbHVtbiB0
aGF0IGlzIGJlaW5nIGRyb3BwZWQgb3IgbW9kaWZpZWQKIEBwYXJhbSBkcm9wX2ZrCQljb25zdHJh
aW50cyBiZWluZyBkcm9wcGVkCiBAcGFyYW0gbl9kcm9wX2ZrCW51bWJlciBvZiBjb25zdHJhaW50
cyB0aGF0IGFyZSBiZWluZyBkcm9wcGVkCiBAcGFyYW0gZHJvcAkJdHJ1ZT1kcm9wIGNvbHVtbiwg
ZmFsc2U9c2V0IE5PVCBOVUxMCi1AcmV0dmFsIHRydWUJCUZhaWx1cmUgKHdpbGwgY2FsbCBteV9l
cnJvcigpKQotQHJldHZhbCBmYWxzZQkJU3VjY2VzcworQHJldHZhbCB0cnVlCQlOb3QgYWxsb3dl
ZCAod2lsbCBjYWxsIG15X2Vycm9yKCkpCitAcmV0dmFsIGZhbHNlCQlBbGxvd2VkCiAqLwogc3Rh
dGljIF9fYXR0cmlidXRlX18oKHB1cmUsIG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpCiBi
b29sCkBAIC0yMDkxLDggKzIwOTEsOCBAQCBjb2x1bW4gdGhhdCBpcyBiZWluZyBkcm9wcGVkIG9y
IG1vZGlmaWVkCiBAcGFyYW0gdXNlcl90YWJsZQlJbm5vREIgdGFibGUgYXMgaXQgaXMgYmVmb3Jl
IHRoZSBBTFRFUiBvcGVyYXRpb24KIEBwYXJhbSBkcm9wX2ZrCQljb25zdHJhaW50cyBiZWluZyBk
cm9wcGVkCiBAcGFyYW0gbl9kcm9wX2ZrCW51bWJlciBvZiBjb25zdHJhaW50cyB0aGF0IGFyZSBi
ZWluZyBkcm9wcGVkCi1AcmV0dmFsIHRydWUJCUZhaWx1cmUgKHdpbGwgY2FsbCBteV9lcnJvcigp
KQotQHJldHZhbCBmYWxzZQkJU3VjY2VzcworQHJldHZhbCB0cnVlCQlOb3QgYWxsb3dlZCAod2ls
bCBjYWxsIG15X2Vycm9yKCkpCitAcmV0dmFsIGZhbHNlCQlBbGxvd2VkCiAqLwogc3RhdGljIF9f
YXR0cmlidXRlX18oKHB1cmUsIG5vbm51bGwsIHdhcm5fdW51c2VkX3Jlc3VsdCkpCiBib29sCkBA
IC0yMTM3LDggKzIxMzcsNyBAQCBpbm5vYmFzZV9jaGVja19mb3JlaWducygKIEBwYXJhbSBoZWFw
CU1lbW9yeSBoZWFwIHdoZXJlIGFsbG9jYXRlZAogQHBhcmFtIGRmaWVsZAlJbm5vREIgZGF0YSBm
aWVsZCB0byBjb3B5IHRvCiBAcGFyYW0gZmllbGQJTXlTUUwgdmFsdWUgZm9yIHRoZSBjb2x1bW4K
LUBwYXJhbSBjb21wCW5vbnplcm8gaWYgaW4gY29tcGFjdCBmb3JtYXQKLSAqLworQHBhcmFtIGNv
bXAJbm9uemVybyBpZiBpbiBjb21wYWN0IGZvcm1hdCAqLwogc3RhdGljIF9fYXR0cmlidXRlX18o
KG5vbm51bGwpKQogdm9pZAogaW5ub2Jhc2VfYnVpbGRfY29sX21hcF9hZGQoCgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5oJwotLS0gYS9zdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMjA2MTgxMjI0NTAtMjlwbjA1dGQ1aGFwZDc0YworKysgYi9zdG9yYWdlL2lubm9i
YXNlL2luY2x1ZGUvZGljdDBkaWN0LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MjA2MTgyMDM0MTMtbnhtd2Q4MmJ4anczendlOApAQCAtMTM3OCw4ICsxMzc4LDkgQEAgRGV0ZXJt
aW5lcyBpZiBhIHNlY29uZGFyeSBpbmRleCBpcyBiZWluZwogb3IgaWYgdGhlIHRhYmxlIGlzIGJl
aW5nIHJlYnVpbHQgb25saW5lLCBhbGxvd2luZyBjb25jdXJyZW50IG1vZGlmaWNhdGlvbnMKIHRv
IHRoZSB0YWJsZS4KIEByZXR2YWwgdHJ1ZSBpZiB0aGUgaW5kZXggaXMgYmVpbmcgb3IgaGFzIGJl
ZW4gYnVpbHQgb25saW5lLCBvcgotaWYgdGhpcyBpcyBhIGNsdXN0ZXJlZCBpbmRleCBhbmQgdGhl
IHRhYmxlIGlzIG9yIHdhcyBiZWluZyByZWJ1aWx0IG9ubGluZQotQHJldHZhbCBmYWxzZSBpZiB0
aGUgaW5kZXggaGFzIGJlZW4gY3JlYXRlZCBjb21wbGV0ZWx5ICovCitpZiB0aGlzIGlzIGEgY2x1
c3RlcmVkIGluZGV4IGFuZCB0aGUgdGFibGUgaXMgYmVpbmcgb3IgaGFzIGJlZW4gcmVidWlsdCBv
bmxpbmUKK0ByZXR2YWwgZmFsc2UgaWYgdGhlIGluZGV4IGhhcyBiZWVuIGNyZWF0ZWQgb3IgdGhl
IHRhYmxlIGhhcyBiZWVuCityZWJ1aWx0IGNvbXBsZXRlbHkgKi8KIFVOSVZfSU5MSU5FCiBib29s
CiBkaWN0X2luZGV4X2lzX29ubGluZV9kZGwoCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9p
bm5vYmFzZS9pbmNsdWRlL2RpY3QwZGljdC5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNs
dWRlL2RpY3QwZGljdC5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDYxODEy
MjQ1MC0yOXBuMDV0ZDVoYXBkNzRjCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0
MGRpY3QuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTgyMDM0MTMtbnht
d2Q4MmJ4anczendlOApAQCAtMTIwNyw4ICsxMjA3LDkgQEAgRGV0ZXJtaW5lcyBpZiBhIHNlY29u
ZGFyeSBpbmRleCBpcyBiZWluZwogb3IgaWYgdGhlIHRhYmxlIGlzIGJlaW5nIHJlYnVpbHQgb25s
aW5lLCBhbGxvd2luZyBjb25jdXJyZW50IG1vZGlmaWNhdGlvbnMKIHRvIHRoZSB0YWJsZS4KIEBy
ZXR2YWwgdHJ1ZSBpZiB0aGUgaW5kZXggaXMgYmVpbmcgb3IgaGFzIGJlZW4gYnVpbHQgb25saW5l
LCBvcgotaWYgdGhpcyBpcyBhIGNsdXN0ZXJlZCBpbmRleCBhbmQgdGhlIHRhYmxlIGlzIG9yIHdh
cyBiZWluZyByZWJ1aWx0IG9ubGluZQotQHJldHZhbCBmYWxzZSBpZiB0aGUgaW5kZXggaGFzIGJl
ZW4gY3JlYXRlZCBjb21wbGV0ZWx5ICovCitpZiB0aGlzIGlzIGEgY2x1c3RlcmVkIGluZGV4IGFu
ZCB0aGUgdGFibGUgaXMgYmVpbmcgb3IgaGFzIGJlZW4gcmVidWlsdCBvbmxpbmUKK0ByZXR2YWwg
ZmFsc2UgaWYgdGhlIGluZGV4IGhhcyBiZWVuIGNyZWF0ZWQgb3IgdGhlIHRhYmxlIGhhcyBiZWVu
CityZWJ1aWx0IGNvbXBsZXRlbHkgKi8KIFVOSVZfSU5MSU5FCiBib29sCiBkaWN0X2luZGV4X2lz
X29ubGluZV9kZGwoCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRl
L21lbTBtZW0uaWMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9tZW0wbWVtLmljCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTIwNjE4MTIyNDUwLTI5cG4wNXRkNWhhcGQ3
NGMKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL21lbTBtZW0uaWMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA2MTgyMDM0MTMtbnhtd2Q4MmJ4anczendlOApAQCAtMjUx
LDEyICsyNTEsOSBAQCBtZW1faGVhcF9mcmVlX2hlYXBfdG9wKAogCWlib29sCQllcnJvcjsKIAl1
bGludAkJdG90YWxfc2l6ZTsKIAl1bGludAkJc2l6ZTsKLSNlbmRpZgogCiAJdXRfYWQobWVtX2hl
YXBfY2hlY2soaGVhcCkpOwogCi0jaWYgZGVmaW5lZCBVTklWX01FTV9ERUJVRyB8fCBkZWZpbmVk
IFVOSVZfREVCVUcKLQogCS8qIFZhbGlkYXRlIHRoZSBoZWFwIGFuZCBnZXQgaXRzIHRvdGFsIGFs
bG9jYXRlZCBzaXplICovCiAJbWVtX2hlYXBfdmFsaWRhdGVfb3JfcHJpbnQoaGVhcCwgTlVMTCwg
RkFMU0UsICZlcnJvciwgJnRvdGFsX3NpemUsCiAJCQkJICAgTlVMTCwgTlVMTCk7Cgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBtZXJnZS5oJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvcm93MG1lcmdlLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMjA2MTgxMjI0NTAtMjlwbjA1dGQ1aGFwZDc0YworKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvcm93MG1lcmdlLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMjA2MTgyMDM0MTMtbnhtd2Q4MmJ4anczendlOApAQCAtMTIzLDEwICsxMjMsMTAgQEAgdHlw
ZWRlZiBzdHJ1Y3QgbWVyZ2VfaW5kZXhfZGVmX3N0cnVjdAltZQogc3RydWN0IHJvd19tZXJnZV9k
dXBfdCB7CiAJZGljdF9pbmRleF90KgkJaW5kZXg7CS8qITwgaW5kZXggYmVpbmcgc29ydGVkICov
CiAJc3RydWN0IFRBQkxFKgkJdGFibGU7CS8qITwgTXlTUUwgdGFibGUgb2JqZWN0ICovCi0JY29u
c3QgdWxpbnQqCQljb2xfbWFwOy8qITwgbWFwcGluZyBvZiBtYXBwaW5nIG9mCi0JCQkJCWNvbHVt
biBudW1iZXJzIGluIHRhYmxlIHRvIHRoZQotCQkJCQlyZWJ1aWx0IHRhYmxlIChpbmRleC0+dGFi
bGUpLAotCQkJCQlvciBOVUxMIGlmIG5vdCByZWJ1aWxkaW5nIHRhYmxlICovCisJY29uc3QgdWxp
bnQqCQljb2xfbWFwOy8qITwgbWFwcGluZyBvZiBjb2x1bW4gbnVtYmVycworCQkJCQlpbiB0YWJs
ZSB0byB0aGUgcmVidWlsdCB0YWJsZQorCQkJCQkoaW5kZXgtPnRhYmxlKSwgb3IgTlVMTCBpZiBu
b3QKKwkJCQkJcmVidWlsZGluZyB0YWJsZSAqLwogCXVsaW50CQkJbl9kdXA7CS8qITwgbnVtYmVy
IG9mIGR1cGxpY2F0ZXMgKi8KIH07CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBw
dXNoIGVtYWlscyku