From: Jon Olav Hauglid
Date: June 29 2011 2:47pm
Subject: bzr push into mysql-trunk branch (jon.hauglid:3243 to 3244) Bug#12694147
List-Archive: http://lists.mysql.com/commits/140027
X-Bug: 12694147
Message-Id: <201106291447.p5TElkQP031631@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDMyNDQgSm9uIE9sYXYgSGF1Z2xpZAkyMDExLTA2LTI5CiAgICAgIEJ1ZyMxMjY5NDE0NyBDT01Q
SUxJTkcgV0lUSCAtRFdJVEhPVVRfUEFSVElUSU9OX1NUT1JBR0VfRU5HSU5FPTEKICAgICAgICAg
ICAgICAgICAgIEFORCBXSVRIT1VUIC1PIEZBSUxTISAoZm9ybWVybHkga25vd24gYXMgNjE2MjUp
CiAgICAgIAogICAgICBUaGUgcHJvYmxlbSB3YXMgdGhhdCB0aGUgc2VydmVyIHdvdWxkIG5vdCBj
b21waWxlIGlmIHBhcnRpdGlvbmluZwogICAgICB3YXMgZGlzYWJsZWQuIFRoaXMgd2FzIGNhdXNl
ZCBieSB0d28gY2FsbHMgdG8gdGhlIAogICAgICBwYXJ0aXRpb25fa2V5X21vZGlmaWVkKCkgZnVu
Y3Rpb24gd2hpY2ggaXMgb25seSBkZWZpbmVkIGlmCiAgICAgIHBhcnRpdGlvbmluZyBzdXBwb3J0
IGlzIGVuYWJsZWQuIFRoaXMgcmVncmVzc2lvbiB3YXMgY2F1c2VkIGJ5CiAgICAgIHRoZSBwYXRj
aCBmb3IgQnVnIzExNzYyNzUxLgogICAgICAKICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGUgcHJv
YmxlbSBieSB3cmFwcGluZyB0aGUgb2ZmZW5kaW5nIGNhbGxzIGluCiAgICAgICNpZmRlZiBXSVRI
X1BBUlRJVElPTl9TVE9SQUdFX0VOR0lORSAvICNlbmRpZi4KICAgICAgCiAgICAgIFRoZSBwYXRj
aCBhbHNvIGZpeGVzIGEgdGVzdCBjYXNlIHdoaWNoIHVzZWQgcGFydGl0aW9uaW5nIHdpdGhvdXQK
ICAgICAgaGF2aW5nICItLXNvdXJjZSBpbmNsdWRlL2hhdmVfcGFydGl0aW9uLmluYyIuIFRoaXMg
bWVhbnQgdGhhdCB0aGUKICAgICAgdGVzdCBjYXNlIHdvdWxkIGZhaWwgb24gc2VydmVycyBjb25m
aWd1cmVkIHdpdGhvdXQgcGFydGl0aW9uaW5nLgogICAgICAKICAgICAgTm8gdGVzdCBjYXNlIGFk
ZGVkLgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9w
YXJ0X3RhYmxlX2lvLnRlc3QKICAgICAgc3FsL3NxbF91cGRhdGUuY2MKIDMyNDMgTWFya28gTcOk
a2Vsw6QJMjAxMS0wNi0yOSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3FsLTUuNSB0byBteXNxbC10
cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3RyeDBz
eXMuaAo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9zdWl0ZS9wZXJmc2NoZW1hL3QvcGFy
dF90YWJsZV9pby50ZXN0JwotLS0gYS9teXNxbC10ZXN0L3N1aXRlL3BlcmZzY2hlbWEvdC9wYXJ0
X3RhYmxlX2lvLnRlc3QJMjAxMC0xMS0wOSAwNTowMjo0NiArMDAwMAorKysgYi9teXNxbC10ZXN0
L3N1aXRlL3BlcmZzY2hlbWEvdC9wYXJ0X3RhYmxlX2lvLnRlc3QJMjAxMS0wNi0yOSAxNDo0Njo1
OCArMDAwMApAQCAtMTUsNiArMTUsNyBAQAogCiAjIFRlc3RzIGZvciBQRVJGT1JNQU5DRV9TQ0hF
TUEgdGFibGUgaW8KIAorLS1zb3VyY2UgaW5jbHVkZS9oYXZlX3BhcnRpdGlvbi5pbmMKIC0tc291
cmNlIGluY2x1ZGUvbm90X2VtYmVkZGVkLmluYwogLS1zb3VyY2UgaW5jbHVkZS9oYXZlX3BlcmZz
Y2hlbWEuaW5jCiAtLXNvdXJjZSAuLi9pbmNsdWRlL3RhYmxlX2lvX3NldHVwX2hlbHBlci5pbmMK
Cj09PSBtb2RpZmllZCBmaWxlICdzcWwvc3FsX3VwZGF0ZS5jYycKLS0tIGEvc3FsL3NxbF91cGRh
dGUuY2MJMjAxMS0wNi0yNCAwOToyOTowNyArMDAwMAorKysgYi9zcWwvc3FsX3VwZGF0ZS5jYwky
MDExLTA2LTI5IDE0OjQ2OjU4ICswMDAwCkBAIC0xMDU2LDYgKzEwNTYsNyBAQCBib29sIHVuc2Fm
ZV9rZXlfdXBkYXRlKFRBQkxFX0xJU1QgKmxlYXZlCiAgICAgICAgIFRBQkxFICp0YWJsZTI9IHRs
Mi0+dGFibGU7CiAgICAgICAgIGlmICh0YWJsZTItPm1hcCAmIHRhYmxlc19mb3JfdXBkYXRlICYm
IHRhYmxlMS0+cyA9PSB0YWJsZTItPnMpCiAgICAgICAgIHsKKyNpZmRlZiBXSVRIX1BBUlRJVElP
Tl9TVE9SQUdFX0VOR0lORQogICAgICAgICAgIC8vIEEgdGFibGUgaXMgdXBkYXRlZCB0aHJvdWdo
IHR3byBhbGlhc2VzCiAgICAgICAgICAgaWYgKHRhYmxlX3BhcnRpdGlvbmVkICYmCiAgICAgICAg
ICAgICAgIChwYXJ0aXRpb25fa2V5X21vZGlmaWVkKHRhYmxlMSwgdGFibGUxLT53cml0ZV9zZXQp
IHx8CkBAIC0xMDY5LDYgKzEwNzAsNyBAQCBib29sIHVuc2FmZV9rZXlfdXBkYXRlKFRBQkxFX0xJ
U1QgKmxlYXZlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDogdGwy
LT5hbGlhcyk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICB9CisjZW5kaWYK
IAogICAgICAgICAgIGlmIChwcmlta2V5X2NsdXN0ZXJlZCkKICAgICAgICAgICB7CgpObyBidW5k
bGUgKHJlYXNvbjogdXNlbGVzcyBmb3IgcHVzaCBlbWFpbHMpLg==