From: Jon Olav Hauglid
Date: September 11 2012 2:35pm
Subject: bzr push into mysql-5.5 branch (jon.hauglid:3969 to 3970) WL#6454
List-Archive: http://lists.mysql.com/commits/144728
Message-Id: <20120911143541.31838.4107.3970@atum08.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM5NzAgSm9uIE9sYXYgSGF1Z2xpZAkyMDEyLTA5LTExCiAgICAgIFdMIzY0NTQ6IERlcHJlY2F0
ZSBTSE9XIEFVVEhPUlMgYW5kIFNIT1cgQ09OVFJJQlVUT1JTCiAgICAgIAogICAgICBBZGRlZCBk
ZXByZWNhdGlvbiB3YXJuaW5nIGZvciBTSE9XIEFVVEhPUlMgYW5kCiAgICAgIFNIT1cgQ09OVFJJ
QlVUT1JTLgogICAgICAKICAgICAgVGhpcyBpcyB0aGUgNS41IHZlcnNpb24gb2YgdGhlIHBhdGNo
LgoKICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvY29udHJpYnV0b3JzLnJlc3VsdAog
ICAgICBteXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQKICAgICAgbXlzcWwtdGVzdC90L3No
b3dfY2hlY2sudGVzdAogICAgICBzcWwvc3FsX3lhY2MueXkKIDM5NjkgR2VvcmdpIEtvZGlub3YJ
MjAxMi0wOC0yNAogICAgICBCdWcgIzE0MTgxMDQ5OiBNWVNRTF9JTlNUQUxMX0RCLlBMIENSRUFU
RVMgRU1QVFkgU1lTVEVNIFRBQkxFUyBGT1IgTVlTUUwgCiAgICAgIAogICAgICBUaGUgc2NyaXB0
IGlzIGRpZmZlcmVudCBmcm9tIHdoYXQncyB1c2VkIG9uIHVuaXhlcy4KICAgICAgSXQgd2FzIG5v
dCBwbGF5aW5nIHRoZSB0YWJsZSBpbnNlcnRpb24gc2NyaXB0IChteXNxbF9zeXN0ZW1fdGFibGVz
X2RhdGEuc3FsKSwKICAgICAgYWx0aG91Z2ggaXQgd2FzIGNoZWNraW5nIGZvciB0aGUgcHJlc2Vu
Y2Ugb2YgdGhpcyBzY3JpcHQuCiAgICAgIEZpeGVkIGJ5IHJlLWVuYWJsaW5nIHRoZSBsb29rdXAg
Zm9yIHRoaXMgZmlsZSBhbmQgcmVwbGF5aW5nIGl0IGF0IGJvb3RzdHJhcAogICAgICB0aW1lLiBO
b3RlIHRoYXQgb24gdGhlIFVuaXhlcyAiU0VMRUNUIEBAaG9zdG5hbWUiIGRvZXMgcmV0dXJuIGEg
ZnVsbHkgcXVhbGlmaWVkCiAgICAgIG5hbWUsIHdoZXJlYXMgb24gV2luZG93cyBpdCByZXR1cm5z
IG9ubHkgYSBob3N0bmFtZS4KICAgICAgU28gYnkgZGVmYXVsdCB3ZSdyZSBmaWx0ZXJpbmcgcmVj
b3JkcyBpbiB0aGUgbXlzcWwudXNlciB0YWJsZSB1bnRpbCB3ZSBlbnN1cmUKICAgICAgdGhpcyBp
cyBmaXhlZC4KCiAgICBtb2RpZmllZDoKICAgICAgc2NyaXB0cy9teXNxbF9pbnN0YWxsX2RiLnBs
LmluCj09PSBtb2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3IvY29udHJpYnV0b3JzLnJlc3VsdCcK
LS0tIGEvbXlzcWwtdGVzdC9yL2NvbnRyaWJ1dG9ycy5yZXN1bHQJMjAwNi0wNS0wMyAwMDo1Mzoy
NiArMDAwMAorKysgYi9teXNxbC10ZXN0L3IvY29udHJpYnV0b3JzLnJlc3VsdAkyMDEyLTA5LTEx
IDE0OjI5OjUxICswMDAwCkBAIC0zLDMgKzMsNSBAQCBOYW1lCUxvY2F0aW9uCUNvbW1lbnQKIFJv
bmFsZCBCcmFkZm9yZAlCcmlzYmFuZSwgQXVzdHJhbGlhCUVGRiBjb250cmlidXRpb24gZm9yIFVD
MjAwNiBBdWN0aW9uCiBTaGVlcmkgS3JpdHplcglCb3N0b24sIE1hc3MuIFVTQQlFRkYgY29udHJp
YnV0aW9uIGZvciBVQzIwMDYgQXVjdGlvbgogTWFyayBTaHV0dGxld29ydGgJTG9uZG9uLCBVSy4J
RUZGIGNvbnRyaWJ1dGlvbiBmb3IgVUMyMDA2IEF1Y3Rpb24KK1dhcm5pbmdzOgorV2FybmluZwkx
NjgxCSdTSE9XIENPTlRSSUJVVE9SUycgaXMgZGVwcmVjYXRlZCBhbmQgd2lsbCBiZSByZW1vdmVk
IGluIGEgZnV0dXJlIHJlbGVhc2UuCgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC9yL3No
b3dfY2hlY2sucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1bHQJMjAx
MS0wOS0yNyAxMjoxNDozMSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Ivc2hvd19jaGVjay5yZXN1
bHQJMjAxMi0wOS0xMSAxNDoyOTo1MSArMDAwMApAQCAtMTU1MiwzICsxNTUyLDE0IEBAIFJFTEVB
U0VfTE9DSygndCcpCiDvv73vv73vv73vv73vv73vv73vv73vv70KIDEKIFNFVCBOQU1FUyBsYXRp
bjE7CisjCisjIFdMIzY0NTQ6IERlcHJlY2F0ZSBTSE9XIEFVVEhPUlMgYW5kIFNIT1cgQ09OVFJJ
QlVUT1JTCisjCitTSE9XIEFVVEhPUlM7CitTSE9XIFdBUk5JTkdTOworTGV2ZWwJQ29kZQlNZXNz
YWdlCitXYXJuaW5nCTE2ODEJJ1NIT1cgQVVUSE9SUycgaXMgZGVwcmVjYXRlZCBhbmQgd2lsbCBi
ZSByZW1vdmVkIGluIGEgZnV0dXJlIHJlbGVhc2UuCitTSE9XIENPTlRSSUJVVE9SUzsKK1NIT1cg
V0FSTklOR1M7CitMZXZlbAlDb2RlCU1lc3NhZ2UKK1dhcm5pbmcJMTY4MQknU0hPVyBDT05UUklC
VVRPUlMnIGlzIGRlcHJlY2F0ZWQgYW5kIHdpbGwgYmUgcmVtb3ZlZCBpbiBhIGZ1dHVyZSByZWxl
YXNlLgoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9zaG93X2NoZWNrLnRlc3QnCi0t
LSBhL215c3FsLXRlc3QvdC9zaG93X2NoZWNrLnRlc3QJMjAxMS0xMC0xOSAyMTo0NDoxNyArMDAw
MAorKysgYi9teXNxbC10ZXN0L3Qvc2hvd19jaGVjay50ZXN0CTIwMTItMDktMTEgMTQ6Mjk6NTEg
KzAwMDAKQEAgLTEzNzEsMyArMTM3MSwxNyBAQCBTRUxFQ1QgUkVMRUFTRV9MT0NLKCd0Jyk7CiAt
LWNvbm5lY3Rpb24gZGVmYXVsdAogU0VUIE5BTUVTIGxhdGluMTsKIAorCistLWVjaG8gIworLS1l
Y2hvICMgV0wjNjQ1NDogRGVwcmVjYXRlIFNIT1cgQVVUSE9SUyBhbmQgU0hPVyBDT05UUklCVVRP
UlMKKy0tZWNobyAjCisKKy0tZGlzYWJsZV9yZXN1bHRfbG9nCitTSE9XIEFVVEhPUlM7CistLWVu
YWJsZV9yZXN1bHRfbG9nCitTSE9XIFdBUk5JTkdTOworCistLWRpc2FibGVfcmVzdWx0X2xvZwor
U0hPVyBDT05UUklCVVRPUlM7CistLWVuYWJsZV9yZXN1bHRfbG9nCitTSE9XIFdBUk5JTkdTOwoK
PT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfeWFjYy55eScKLS0tIGEvc3FsL3NxbF95YWNjLnl5
CTIwMTItMDYtMjkgMTQ6Mzg6MjkgKzAwMDAKKysrIGIvc3FsL3NxbF95YWNjLnl5CTIwMTItMDkt
MTEgMTQ6Mjk6NTEgKzAwMDAKQEAgLTExMDEwLDExICsxMTAxMCwxOSBAQCBzaG93X3BhcmFtOgog
ICAgICAgICAgIHsKICAgICAgICAgICAgIExFWCAqbGV4PUxleDsKICAgICAgICAgICAgIGxleC0+
c3FsX2NvbW1hbmQ9IFNRTENPTV9TSE9XX0FVVEhPUlM7CisgICAgICAgICAgICBwdXNoX3dhcm5p
bmdfcHJpbnRmKFlZVEhELCBNWVNRTF9FUlJPUjo6V0FSTl9MRVZFTF9XQVJOLAorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBFUl9XQVJOX0RFUFJFQ0FURURfU1lOVEFYX05PX1JFUExB
Q0VNRU5ULAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBFUihFUl9XQVJOX0RFUFJF
Q0FURURfU1lOVEFYX05PX1JFUExBQ0VNRU5UKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIlNIT1cgQVVUSE9SUyIpOwogICAgICAgICAgIH0KICAgICAgICAgfCBDT05UUklCVVRP
UlNfU1lNCiAgICAgICAgICAgewogICAgICAgICAgICAgTEVYICpsZXg9TGV4OwogICAgICAgICAg
ICAgbGV4LT5zcWxfY29tbWFuZD0gU1FMQ09NX1NIT1dfQ09OVFJJQlVUT1JTOworICAgICAgICAg
ICAgcHVzaF93YXJuaW5nX3ByaW50ZihZWVRIRCwgTVlTUUxfRVJST1I6OldBUk5fTEVWRUxfV0FS
TiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRVJfV0FSTl9ERVBSRUNBVEVEX1NZ
TlRBWF9OT19SRVBMQUNFTUVOVCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRVIo
RVJfV0FSTl9ERVBSRUNBVEVEX1NZTlRBWF9OT19SRVBMQUNFTUVOVCksCisgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICJTSE9XIENPTlRSSUJVVE9SUyIpOwogICAgICAgICAgIH0KICAg
ICAgICAgfCBQUklWSUxFR0VTCiAgICAgICAgICAgewoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxl
c3MgZm9yIHB1c2ggZW1haWxzKS4=