From: marko.makela
Date: May 30 2012 9:59am
Subject: bzr push into mysql-trunk-wl6255 branch (marko.makela:3903 to 3904) WL#6255
List-Archive: http://lists.mysql.com/commits/144023
Message-Id: <201205300959.q4U9xqn7017433@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5MDQgTWFya28gTcOka2Vsw6QJMjAxMi0wNS0zMAogICAgICBXTCM2MjU1OiBXaGVuIHJlYnVp
bGRpbmcgYSB0YWJsZSwgdG9sZXJhdGUgZGlzY2FyZGVkIG9yIG1pc3NpbmcgdGFibGVzcGFjZXMu
CiAgICAgIAogICAgICBkaWN0X3RhYmxlX3JlbmFtZV9pbl9jYWNoZSgpOiBEbyBub3QgYXR0ZW1w
dCB0byByZW5hbWUgbWlzc2luZwogICAgICB0YWJsZXNwYWNlIGZpbGVzLgogICAgICAKICAgICAg
cm93X2Ryb3BfdGFibGVfZm9yX215c3FsKCk6IERvIG5vdCBhdHRlbXB0IHRvIGRyb3AgbWlzc2lu
ZyBmaWxlcy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qw
ZGljdC5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuY2MKIDM5MDMgTWFy
a28gTcOka2Vsw6QJMjAxMi0wNS0zMAogICAgICBXTCM2MjU1IHJlZmFjdG9yaW5nLgogICAgICAK
ICAgICAgcm93X2luc19kdXBsaWNhdGVfZXJyb3JfaW5fY2x1c3QoKTogSW4gb25saW5lIHRhYmxl
IHJlYnVpbGQsCiAgICAgIGlmIHRoZSBQUklNQVJZIEtFWSxEQl9UUlhfSUQsREJfUk9MTF9QVFIg
bWF0Y2ggd2l0aCB0aGUgcmVjb3JkLAogICAgICByZXR1cm4gdGhlIHNwZWNpYWwgc3RhdHVzIGNv
ZGUgREJfU1VDQ0VTU19MT0NLRURfUkVDLgogICAgICAKICAgICAgcm93X2xvZ190YWJsZV9hcHBs
eV9pbnNlcnRfbG93KCk6IElmIHRoZSByZWNvcmQgYWxyZWFkeSBleGlzdGVkCiAgICAgIGluIHRo
ZSBjbHVzdGVyZWQgaW5kZXgsIHJldHVybiBEQl9TVUNDRVNTLgoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uv
cm93L3JvdzBsb2cuY2MKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9k
aWN0MGRpY3QuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGRpY3QuY2MJcmV2
aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMjA1MzAwODIxMjEtNWtsb3JjYmF6M3oxenVp
bgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBkaWN0LmNjCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTIwNTMwMDk1NjQzLW11OGJwaGlmYm9uZXlvdG0KQEAgLTE0Mjks
NyArMTQyOSw5IEBAIGRpY3RfdGFibGVfcmVuYW1lX2luX2NhY2hlKAogCS8qIElmIHRoZSB0YWJs
ZSBpcyBzdG9yZWQgaW4gYSBzaW5nbGUtdGFibGUgdGFibGVzcGFjZSwgcmVuYW1lIHRoZQogCS5p
YmQgZmlsZSAqLwogCi0JaWYgKHRhYmxlLT5zcGFjZSAhPSAwKSB7CisJaWYgKHRhYmxlLT5zcGFj
ZSAhPSAwCisJICAgICYmICF0YWJsZS0+dGFibGVzcGFjZV9kaXNjYXJkZWQKKwkgICAgJiYgIXRh
YmxlLT5pYmRfZmlsZV9taXNzaW5nKSB7CiAJCWlmICh0YWJsZS0+ZGlyX3BhdGhfb2ZfdGVtcF90
YWJsZSAhPSBOVUxMKSB7CiAJCQl1dF9wcmludF90aW1lc3RhbXAoc3RkZXJyKTsKIAkJCWZwdXRz
KCIgIElubm9EQjogRXJyb3I6IHRyeWluZyB0byByZW5hbWUgYSIKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwbXlzcWwuY2MnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jh
c2Uvcm93L3JvdzBteXNxbC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUz
MDA4MjEyMS01a2xvcmNiYXozejF6dWluCisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBt
eXNxbC5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDUzMDA5NTY0My1tdThi
cGhpZmJvbmV5b3RtCkBAIC0zODM1LDYgKzM4MzUsMTEgQEAgY2hlY2tfbmV4dF9mb3JlaWduOgog
CiAJCWlzX3RlbXAgPSB0YWJsZS0+ZmxhZ3MyICYgRElDVF9URjJfVEVNUE9SQVJZOwogCQl1dF9h
KHRhYmxlLT5kaXJfcGF0aF9vZl90ZW1wX3RhYmxlID09IE5VTEwgfHwgaXNfdGVtcCk7CisJCWlm
ICh0YWJsZS0+dGFibGVzcGFjZV9kaXNjYXJkZWQgfHwgdGFibGUtPmliZF9maWxlX21pc3Npbmcp
IHsKKwkJCS8qIERvIG5vdCBhdHRlbXB0IHRvIGRyb3Aga25vd24tdG8tYmUtbWlzc2luZworCQkJ
dGFibGVzcGFjZXMuICovCisJCQlzcGFjZV9pZCA9IDA7CisJCX0KIAogCQlpZiAoZGljdF90YWJs
ZV9oYXNfZnRzX2luZGV4KHRhYmxlKQogCQkgICAgfHwgRElDVF9URjJfRkxBR19JU19TRVQodGFi
bGUsIERJQ1RfVEYyX0ZUU19IQVNfRE9DX0lEKSkgewoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxl
c3MgZm9yIHB1c2ggZW1haWxzKS4=