From: marko.makela
Date: October 5 2011 9:28am
Subject: bzr push into mysql-5.1 branch (marko.makela:3620 to 3621)
List-Archive: http://lists.mysql.com/commits/141308
Message-Id: <201110050928.p959SlWI000756@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM2MjEgTWFya28gTcOka2Vsw6QJMjAxMS0xMC0wNQogICAgICBBZGQgSW5ub0RCIFVOSVZfU1lO
Q19ERUJVRyBhc3NlcnRpb25zIHRvIHJ3LWxvY2sgY29kZS4KICAgICAgCiAgICAgIHJ3X2xvY2tf
eF9sb2NrX2Z1bmMoKTogQXNzZXJ0IHRoYXQgdGhlIHRocmVhZCBpcyBub3QgYWxyZWFkeSBob2xk
aW5nCiAgICAgIHRoZSBsb2NrIGluIGEgY29uZmxpY3RpbmcgbW9kZSAoUldfTE9DS19TSEFSRUQp
LgogICAgICAKICAgICAgcndfbG9ja19zX2xvY2tfZnVuYygpOiBBc3NlcnQgdGhhdCB0aGUgdGhy
ZWFkIGlzIG5vdCBhbHJlYWR5IGhvbGRpbmcKICAgICAgdGhlIGxvY2sgaW4gYSBjb25mbGljdGlu
ZyBtb2RlIChSV19MT0NLX0VYKS4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pbmNsdWRlL3N5bmMwcncuaWMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncu
YwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9zeW5jMHJ3LmljCiAgICAgIHN0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYwogMzYyMCBNYXJrbyBNw6RrZWzDpAky
MDExLTEwLTA0CiAgICAgIENvcnJlY3QgdGhlIENoYW5nZUxvZwoKICAgIG1vZGlmaWVkOgogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9iYXNlL2luY2x1ZGUvc3luYzBydy5pYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9p
bmNsdWRlL3N5bmMwcncuaWMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTEwMDQx
ODAxNDAtZTFnMmdjc2ozajZmNXBmdQorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvc3lu
YzBydy5pYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTAwNTA5MDE0Ny1tajFw
cXBueTJoejBpYWoxCkBAIC0yMzgsNiArMjM4LDcgQEAgcndfbG9ja19zX2xvY2tfZnVuYygKIAog
I2lmZGVmIFVOSVZfU1lOQ19ERUJVRwogCXV0X2FkKCFyd19sb2NrX293bihsb2NrLCBSV19MT0NL
X1NIQVJFRCkpOyAvKiBzZWUgTk9URSBhYm92ZSAqLworCXV0X2FkKCFyd19sb2NrX293bihsb2Nr
LCBSV19MT0NLX0VYKSk7CiAjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAKIAltdXRleF9l
bnRlcihyd19sb2NrX2dldF9tdXRleChsb2NrKSk7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFn
ZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5
bmMwcncuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMTAwNDE4MDE0MC1lMWcy
Z2NzajNqNmY1cGZ1CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2Uvc3luYy9zeW5jMHJ3LmMJcmV2aWQ6
bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTEwMDUwOTAxNDctbWoxcHFwbnkyaHowaWFqMQpA
QCAtNDc2LDYgKzQ3Niw5IEBAIHJ3X2xvY2tfeF9sb2NrX2Z1bmMoCiAJdWxpbnQJaTsJLyogc3Bp
biByb3VuZCBjb3VudCAqLwogCiAJdXRfYWQocndfbG9ja192YWxpZGF0ZShsb2NrKSk7CisjaWZk
ZWYgVU5JVl9TWU5DX0RFQlVHCisJdXRfYWQoIXJ3X2xvY2tfb3duKGxvY2ssIFJXX0xPQ0tfU0hB
UkVEKSk7CisjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICovCiAKIGxvY2tfbG9vcDoKIAkvKiBB
Y3F1aXJlIHRoZSBtdXRleCBwcm90ZWN0aW5nIHRoZSBydy1sb2NrIGZpZWxkcyAqLwoKPT09IG1v
ZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3N5bmMwcncuaWMnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9pbmNsdWRlL3N5bmMwcncuaWMJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMTEwMDQxODAxNDAtZTFnMmdjc2ozajZmNXBmdQorKysgYi9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vaW5jbHVkZS9zeW5jMHJ3LmljCXJldmlkOm1hcmtvLm1ha2Vs
YUBvcmFjbGUuY29tLTIwMTExMDA1MDkwMTQ3LW1qMXBxcG55Mmh6MGlhajEKQEAgLTQwNiw2ICs0
MDYsNyBAQCByd19sb2NrX3NfbG9ja19mdW5jKAogCiAjaWZkZWYgVU5JVl9TWU5DX0RFQlVHCiAJ
dXRfYWQoIXJ3X2xvY2tfb3duKGxvY2ssIFJXX0xPQ0tfU0hBUkVEKSk7IC8qIHNlZSBOT1RFIGFi
b3ZlICovCisJdXRfYWQoIXJ3X2xvY2tfb3duKGxvY2ssIFJXX0xPQ0tfRVgpKTsKICNlbmRpZiAv
KiBVTklWX1NZTkNfREVCVUcgKi8KIAogCS8qIFRPRE86IHN0dWR5IHBlcmZvcm1hbmNlIG9mIFVO
SVZfTElLRUxZIGJyYW5jaCBwcmVkaWN0aW9uIGhpbnRzLiAqLwoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9zeW5jL3N5bmMwcncuYycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL3N5bmMvc3luYzBydy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTExMDA0MTgwMTQwLWUxZzJnY3NqM2o2ZjVwZnUKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2lu
L3N5bmMvc3luYzBydy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTExMDA1MDkw
MTQ3LW1qMXBxcG55Mmh6MGlhajEKQEAgLTYxMiw2ICs2MTIsOSBAQCByd19sb2NrX3hfbG9ja19m
dW5jKAogCWlib29sICAgc3Bpbm5pbmcgPSBGQUxTRTsKIAogCXV0X2FkKHJ3X2xvY2tfdmFsaWRh
dGUobG9jaykpOworI2lmZGVmIFVOSVZfU1lOQ19ERUJVRworCXV0X2FkKCFyd19sb2NrX293bihs
b2NrLCBSV19MT0NLX1NIQVJFRCkpOworI2VuZGlmIC8qIFVOSVZfU1lOQ19ERUJVRyAqLwogCiAJ
aSA9IDA7CiAKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku