From: marko.makela
Date: June 18 2012 10:42am
Subject: bzr push into mysql-trunk branch (marko.makela:4030 to 4031) Bug#14198766
List-Archive: http://lists.mysql.com/commits/144249
X-Bug: 14198766
Message-Id: <20120618104246.28233.21242.4031@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQwMzEgTWFya28gTcOka2Vsw6QJMjAxMi0wNi0xOAogICAgICBCdWcjMTQxOTg3NjYgKGZvbGxv
d3VwKSByb3dfZHJvcF90YWJsZV9mb3JfbXlzcWwgcmVsZWFzZXMgZGljdCBsYXRjaAogICAgICB3
aGlsZSBob2xkaW5nIGRpY3QgbG9ja3MKICAgICAgCiAgICAgIFRoZSBvcmlnaW5hbCBwYXRjaCBo
YWQgYSBwcm9ibGVtOiBpdCBjb3VsZCByZWxlYXNlIHRoZSBkaWN0aW9uYXJ5IGxhdGNoCiAgICAg
IGFmdGVyIHdhaXRpbmcgdGhhdCB0aGUgYmFja2dyb3VuZCBzdGF0aXN0aWNzIHRocmVhZCBoYWQg
c3RvcHBlZCB1c2luZwogICAgICB0aGUgdGFibGUuIEZpeCB0aGF0LgogICAgICAKICAgICAgaGFf
aW5ub2Jhc2U6OmNvbW1pdF9pbnBsYWNlX2FsdGVyX3RhYmxlKCk6IEludm9rZSBmdHNfb3B0aW1p
emVfcmVtb3ZlX3RhYmxlKCkKICAgICAgZmlyc3QsIGJlZm9yZSBhY3F1aXJpbmcgdGhlIGRhdGEg
ZGljdGlvbmFyeSBsYXRjaC4KICAgICAgCiAgICAgIEFwcHJvdmVkIGJ5IEppbW15IFlhbmcgb24g
SU0uCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVy
MGFsdGVyLmNjCiA0MDMwIFZhc2lsIERpbW92CTIwMTItMDYtMTgKICAgICAgRm9sbG93dXAgdG8g
dmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEyMDYxNDEwNDMwMy00amlmMDM0OXU1NjR5NW5wCiAg
ICAgIAogICAgICBBbHNvIHNraXAgY29ycnVwdGVkLCB0byBiZSBkcm9wcGVkIGFuZCBvbmxpbmUg
ZGRsIGluZGV4ZXMgZHVyaW5nCiAgICAgIHN0YXRzIHNuYXBzaG90IGNyZWF0ZS4KCiAgICBtb2Rp
ZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3Qwc3RhdHMuY2MKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0g
YS9zdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDp2YXNpbC5k
aW1vdkBvcmFjbGUuY29tLTIwMTIwNjE4MDY1MjIzLW01eTczcnozaWR5aWloc3kKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxh
QG9yYWNsZS5jb20tMjAxMjA2MTgxMDQxNTQtNm44N3J5NHJmbTlzbDYzMApAQCAtMzQ1OCw2ICsz
NDU4LDE4IEBAIGhhX2lubm9iYXNlOjpjb21taXRfaW5wbGFjZV9hbHRlcl90YWJsZSgKIAkJdHJ4
X3N0YXJ0X2Zvcl9kZGwodHJ4LCBvcCk7CiAJfQogCisJaWYgKG5ld19jbHVzdGVyZWQpIHsKKwkJ
aWYgKHByZWJ1aWx0LT50YWJsZS0+ZnRzKSB7CisJCQl1dF9hZCghcHJlYnVpbHQtPnRhYmxlLT5m
dHMtPmFkZF93cSk7CisJCQlmdHNfb3B0aW1pemVfcmVtb3ZlX3RhYmxlKHByZWJ1aWx0LT50YWJs
ZSk7CisJCX0KKworCQlpZiAoY3R4LT5pbmRleGVkX3RhYmxlLT5mdHMpIHsKKwkJCXV0X2FkKCFj
dHgtPmluZGV4ZWRfdGFibGUtPmZ0cy0+YWRkX3dxKTsKKwkJCWZ0c19vcHRpbWl6ZV9yZW1vdmVf
dGFibGUoY3R4LT5pbmRleGVkX3RhYmxlKTsKKwkJfQorCX0KKwogCS8qIExhdGNoIHRoZSBJbm5v
REIgZGF0YSBkaWN0aW9uYXJ5IGV4Y2x1c2l2ZWx5IHNvIHRoYXQgbm8gZGVhZGxvY2tzCiAJb3Ig
bG9jayB3YWl0cyBjYW4gaGFwcGVuIGluIGl0IGR1cmluZyB0aGUgZGF0YSBkaWN0aW9uYXJ5IG9w
ZXJhdGlvbi4gKi8KIAlyb3dfbXlzcWxfbG9ja19kYXRhX2RpY3Rpb25hcnkodHJ4KTsKQEAgLTM0
NzcsMjIgKzM0ODksNiBAQCBoYV9pbm5vYmFzZTo6Y29tbWl0X2lucGxhY2VfYWx0ZXJfdGFibGUo
CiAJCXJlcXVlc3RlZCB0byBiZSBkcm9wcGVkIHdlcmUgbm90IGNyZWF0ZWQgaW4gdGhlIGNvcHkK
IAkJb2YgdGhlIHRhYmxlLiAqLwogCi0JCWlmIChwcmVidWlsdC0+dGFibGUtPmZ0cyB8fCBjdHgt
PmluZGV4ZWRfdGFibGUtPmZ0cykgewotCQkJcm93X215c3FsX3VubG9ja19kYXRhX2RpY3Rpb25h
cnkodHJ4KTsKLQotCQkJaWYgKHByZWJ1aWx0LT50YWJsZS0+ZnRzKSB7Ci0JCQkJdXRfYWQoIXBy
ZWJ1aWx0LT50YWJsZS0+ZnRzLT5hZGRfd3EpOwotCQkJCWZ0c19vcHRpbWl6ZV9yZW1vdmVfdGFi
bGUocHJlYnVpbHQtPnRhYmxlKTsKLQkJCX0KLQotCQkJaWYgKGN0eC0+aW5kZXhlZF90YWJsZS0+
ZnRzKSB7Ci0JCQkJdXRfYWQoIWN0eC0+aW5kZXhlZF90YWJsZS0+ZnRzLT5hZGRfd3EpOwotCQkJ
CWZ0c19vcHRpbWl6ZV9yZW1vdmVfdGFibGUoY3R4LT5pbmRleGVkX3RhYmxlKTsKLQkJCX0KLQot
CQkJcm93X215c3FsX2xvY2tfZGF0YV9kaWN0aW9uYXJ5KHRyeCk7Ci0JCX0KLQogCQkvKiBBIG5l
dyBjbHVzdGVyZWQgaW5kZXggd2FzIGRlZmluZWQgZm9yIHRoZSB0YWJsZQogCQlhbmQgdGhlcmUg
d2FzIG5vIGVycm9yIGF0IHRoaXMgcG9pbnQuIFdlIGNhbgogCQlub3cgcmVuYW1lIHRoZSBvbGQg
dGFibGUgYXMgYSB0ZW1wb3JhcnkgdGFibGUsCgpObyBidW5kbGUgKHJlYXNvbjogdXNlbGVzcyBm
b3IgcHVzaCBlbWFpbHMpLg==