From: Tatjana Azundris Nuernberg
Date: October 17 2012 6:59am
Subject: bzr push into mysql-5.6 branch (tatjana.nuernberg:4486 to 4487) Bug#11764559
List-Archive: http://lists.mysql.com/commits/145048
X-Bug: 11764559
Message-Id: <20121017065949.26245.35141.4487@envy>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQ0ODcgVGF0amFuYSBBenVuZHJpcyBOdWVybmJlcmcJMjAxMi0xMC0xNyBbbWVyZ2VdCiAgICAg
IEJ1ZyMxMTc2NDU1OTogVU1BU0sgSVMgSUdOT1JFRCBCWSBFUlJPUiBMT0cKICAgICAgCiAgICAg
IG15c3FsZF9zYWZlIHNjcmlwdCBkaWQgbm90IGhlZWQgTXlTUUwgc3BlY2lmaWMgZW52aXJvbm1l
bnQgdmFyaWFibGUKICAgICAgJFVNQVNLLCBsZWFkaW5nIHRvIGRpdmVyZ2VudCBiZWhhdmlvciBi
ZXR3ZWVuIG15c3FsZCBhbmQgbXlzcWxkX3NhZmUuCiAgICAgIAogICAgICBQYXRjaCBhZGRzIGFu
IGFwcHJveGltYXRpb24gb2YgbXlzcWxkJ3MgYmVoYXZpb3IgdG8gbXlzcWxkX3NhZmUsCiAgICAg
IHdpdGhpbiB0aGUgYm91bmRzIGRpY3RhdGVkIGJ5IGF0dGVtcHQgdG8gaGF2ZSBteXNxbGRfc2Fm
ZSBydW4gb24KICAgICAgZXZlbiB0aGUgbW9zdCBiYXNpYyBvZiBzaGVsbHMgKHByb3BlciAnNzBz
IHNoLCBub3QganVzdCBiYXNoCiAgICAgIHdpdGggYSBmYW5jeSBzeW1saW5rKS4KICAgICAgCiAg
ICAgIFBhdGNoIGFsc28gYWRkcyBhcHByb3hpbWF0aW9uIG9mIHNhaWQgYmVoYXZpb3IgdG8gbXlz
cWxkX211bHRpCiAgICAgIChpbiBwZXJsKS4KICAgICAgCiAgICAgIChiYWNrcG9ydCkKICAgICAg
CiAgICAgIGF1dG8tbWVyZ2UKCiAgICBtb2RpZmllZDoKICAgICAgc2NyaXB0cy9teXNxbGRfbXVs
dGkuc2gKICAgICAgc2NyaXB0cy9teXNxbGRfc2FmZS5zaAogNDQ4NiBNYXJrbyBNw6RrZWzDpAky
MDEyLTEwLTE3CiAgICAgIGRpY3Rfc2V0X2NvcnJ1cHRlZCgpOiBJbml0aWFsaXplIHRoZSB0cmFp
bGluZyBOVUwgYnl0ZSBvZiB0YWJsZV9uYW1lLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL2RpY3QvZGljdDBkaWN0LmNjCj09PSBtb2RpZmllZCBmaWxlICdzY3JpcHRzL215
c3FsZF9tdWx0aS5zaCcKLS0tIGEvc2NyaXB0cy9teXNxbGRfbXVsdGkuc2gJMjAxMS0wOS0yMCAw
OTozMTowNSArMDAwMAorKysgYi9zY3JpcHRzL215c3FsZF9tdWx0aS5zaAkyMDEyLTEwLTE3IDA2
OjU2OjEzICswMDAwCkBAIC00OCw2ICs0OCwyOCBAQCAkaG9tZWRpciA9ICRFTlZ7SE9NRX07CiAk
bXlfcHJvZ25hbWUgPSAkMDsKICRteV9wcm9nbmFtZSA9fiBzLy4qW1wvXS8vOwogCisKK2lmIChk
ZWZpbmVkKCRFTlZ7VU1BU0t9KSkgeworICBteSAkVU1BU0sgPSAkRU5We1VNQVNLfTsKKyAgbXkg
JG07CisgIG15ICRmbW9kZSA9ICIwNjQwIjsKKworICBpZigoJFVNQVNLID1+IG0vW14wMjQ2XS8p
IHx8ICgkVU1BU0sgPX4gbS9eW14wXS8pIHx8IChsZW5ndGgoJFVNQVNLKSAhPSA0KSkgeworICAg
IHByaW50ZigiVU1BU0sgbXVzdCBiZSBhIDMtZGlnaXQgbW9kZSB3aXRoIGFuIGFkZGl0aW9uYWwg
bGVhZGluZyAwIHRvIGluZGljYXRlIG9jdGFsLlxuIik7CisgICAgcHJpbnRmKCJUaGUgZmlyc3Qg
ZGlnaXQgd2lsbCBiZSBjb3JyZWN0ZWQgdG8gNiwgdGhlIG90aGVycyBtYXkgYmUgMCwgMiwgNCwg
b3IgNi5cbiIpOyB9CisgIGVsc2UgeworICAgICRmbW9kZT0gc3Vic3RyICRVTUFTSywgMiwgMjsK
KyAgICAkZm1vZGU9ICIwNiR7Zm1vZGV9IjsgfQorCisgIGlmKCRmbW9kZSAhPSAkVU1BU0spIHsK
KyAgICBwcmludGYoIlVNQVNLIGNvcnJlY3RlZCBmcm9tICRVTUFTSyB0byAkZm1vZGUgLi4uXG4i
KTsgfQorCisgICRmbW9kZT0gb2N0KCRmbW9kZSk7CisKKyAgdW1hc2soJGZtb2RlKTsKK30KKwor
CiBtYWluKCk7CiAKICMjIyMKCj09PSBtb2RpZmllZCBmaWxlICdzY3JpcHRzL215c3FsZF9zYWZl
LnNoJwotLS0gYS9zY3JpcHRzL215c3FsZF9zYWZlLnNoCTIwMTItMDktMTEgMTQ6Mzc6NDQgKzAw
MDAKKysrIGIvc2NyaXB0cy9teXNxbGRfc2FmZS5zaAkyMDEyLTEwLTE3IDA2OjU2OjEzICswMDAw
CkBAIC0zMiw3ICszMiwyOCBAQCBzeXNsb2dfdGFnX215c3FsZF9zYWZlPW15c3FsZF9zYWZlCiB0
cmFwICcnIDEgMiAzIDE1CQkJIyB3ZSBzaG91bGRuJ3QgbGV0IGFueW9uZSBraWxsIHVzCiB0cmFw
ICcnIDEzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBub3QgZXZlbiBTSUdQSVBFCiAK
LXVtYXNrIDAwNworIyBNeVNRTC1zcGVjaWZpYyBlbnZpcm9ubWVudCB2YXJpYWJsZS4gRmlyc3Qg
b2ZmLCBpdCdzIG5vdCByZWFsbHkgYSB1bWFzaywKKyMgaXQncyB0aGUgZGVzaXJlZCBtb2RlLiBT
ZWNvbmQsIGl0IGZvbGxvd3MgdW1hc2soMiksIG5vdCB1bWFzaygzKSBpbiB0aGF0CisjIG9jdGFs
IG5lZWRzIHRvIGJlIGV4cGxpY2l0LiBPdXIgc2hlbGwgbWlnaHQgYmUgYSBwcm9wZXIgc2ggd2l0
aG91dCBwcmludGYsCisjIG11bHRpcGxlLWJhc2UgYXJpdGhtZXRpYywgYW5kIGJpbmFyeSBhcml0
aG1ldGljLCBzbyB0aGlzIHdpbGwgZ2V0IHVnbHkuCisjIFdlIHJlamVjdCBkZWNpbWFsIHZhbHVl
cyB0byBrZWVwIHRoaW5ncyBhdCBsZWFzdCBoYWxmLXNhbmUuCit1bWFzayAwMDcgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgIyBmYWxsYmFjaworVU1BU0s9IiR7VU1BU0stMDY0MH0iCitm
bW9kZT1gZWNobyAiJFVNQVNLIiB8IHNlZCAtZSAncy9bXjAyNDZdLy9nJ2AKK29jdGFscD1gZWNo
byAiJGZtb2RlInxjdXQgLWMxYAorZm1sZW49YGVjaG8gIiRmbW9kZSJ8d2MgLWN8c2VkIC1lICdz
LyAvL2cnYAoraWYgWyAieCRvY3RhbHAiICE9ICJ4MCIgLW8gIngkVU1BU0siICE9ICJ4JGZtb2Rl
IiAtbyAieCRmbWxlbiIgIT0gIng1IiBdCit0aGVuCisgIGZtb2RlPTA2NDAKKyAgZWNobyAiVU1B
U0sgbXVzdCBiZSBhIDMtZGlnaXQgbW9kZSB3aXRoIGFuIGFkZGl0aW9uYWwgbGVhZGluZyAwIHRv
IGluZGljYXRlIG9jdGFsLiIgPiYyCisgIGVjaG8gIlRoZSBmaXJzdCBkaWdpdCB3aWxsIGJlIGNv
cnJlY3RlZCB0byA2LCB0aGUgb3RoZXJzIG1heSBiZSAwLCAyLCA0LCBvciA2LiIgPiYyCitmaQor
Zm1vZGU9YGVjaG8gIiRmbW9kZSJ8Y3V0IC1jMy00YAorZm1vZGU9IjYkZm1vZGUiCitpZiBbICJ4
JFVNQVNLIiAhPSAieDAkZm1vZGUiIF0KK3RoZW4KKyAgZWNobyAiVU1BU0sgY29ycmVjdGVkIGZy
b20gJFVNQVNLIHRvIDAkZm1vZGUgLi4uIgorZmkKIAogZGVmYXVsdHM9CiBjYXNlICIkMSIgaW4K
QEAgLTU0Nyw2ICs1NjgsMTIgQEAgdGhlbgogICAjIExvZyB0byBlcnJfbG9nIGZpbGUKICAgbG9n
X25vdGljZSAiTG9nZ2luZyB0byAnJGVycl9sb2cnLiIKICAgbG9nZ2luZz1maWxlCisKKyAgaWYg
WyAhIC1lICIkZXJyX2xvZyIgXTsgdGhlbiAgICAgICAgICAgICAgICAgICMgaWYgZXJyb3IgbG9n
IGFscmVhZHkgZXhpc3RzLAorICAgIHRvdWNoICIkZXJyX2xvZyIgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIyB3ZSBqdXN0IGFwcGVuZC4gb3RoZXJ3aXNlLAorICAgIGNobW9kICIkZm1vZGUi
ICIkZXJyX2xvZyIgICAgICAgICAgICAgICAgICAgIyBmaXggdGhlIHBlcm1pc3Npb25zIGhlcmUh
CisgIGZpCisKIGVsc2UKICAgaWYgWyAtbiAiJHN5c2xvZ190YWciIF0KICAgdGhlbgpAQCAtNzU4
LDYgKzc4NSwxMiBAQCBkbwogCiAgIGV2YWxfbG9nX2Vycm9yICIkY21kIgogCisgIGlmIFsgJHdh
bnRfc3lzbG9nIC1lcSAwIC1hICEgLWUgIiRlcnJfbG9nIiBdOyB0aGVuCisgICAgdG91Y2ggIiRl
cnJfbG9nIiAgICAgICAgICAgICAgICAgICAgIyBoeXBvdGhldGljYWw6IGxvZyB3YXMgcmVuYW1l
ZCBidXQgbm90CisgICAgY2hvd24gJHVzZXIgIiRlcnJfbG9nIiAgICAgICAgICAgICAgIyBmbHVz
aGVkIHlldC4gd2UnZCByZWNyZWF0ZSBpdCB3aXRoCisgICAgY2htb2QgIiRmbW9kZSIgIiRlcnJf
bG9nIiAgICAgICAgICAgIyB3cm9uZyBvd25lciBuZXh0IHRpbWUgd2UgbG9nLCBzbyBzZXQKKyAg
ZmkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjIGl0IHVwIGNvcnJlY3RseSB3
aGlsZSB3ZSBjYW4hCisKICAgZW5kX3RpbWU9YGRhdGUgKyVNJVNgCiAKICAgaWYgdGVzdCAhIC1m
ICIkcGlkX2ZpbGUiCQkjIFRoaXMgaXMgcmVtb3ZlZCBpZiBub3JtYWwgc2h1dGRvd24KCk5vIGJ1
bmRsZSAocmVhc29uOiB1c2VsZXNzIGZvciBwdXNoIGVtYWlscyku