From: Tor Didriksen
Date: March 23 2012 2:32pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3846 to 3847) Bug#13880759
List-Archive: http://lists.mysql.com/commits/143307
X-Bug: 13880759
Message-Id: <201203231432.q2NEWjRo006101@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDM4NDcgVG9yIERpZHJpa3NlbgkyMDEyLTAzLTIzCiAgICAgIEJ1ZyMxMzg4MDc1OSBCVUlMRCBJ
UyBCUk9LRU4gV0hFTiAtRFdJVEhfU1NMPVNZU1RFTQogICAgICAKICAgICAgV2hlbiBjb21waWxl
ZCBhcyBwYXJ0IG9mIGxpYm15c3FsLCAKICAgICAgdGhlICNkZWZpbmVzIGZvciBIQVZFX1lBU1NM
IGFuZCBIQVZFX09QRU5TU0wgd2VyZSBicm9rZW4uCiAgICAgIAogICAgICBGaXhlZCBieSBub3Qg
aW5jbHVkaW5nIG15X2dsb2JhbC5oIGluIG1kNS5jYwogICAgICAoaXQgZG9lcyBub3QgbmVlZCBp
dCwgc28gaXQgc2hvdWxkIG5vdCBiZSBpbmNsdWRlZCkKICAgICBAIGluY2x1ZGUvbXlfbWQ1LmgK
ICAgICAgICBSZXBsYWNlIHRoZSBDX01PREVfU1RBUlQgYW5kIENfTU9ERV9FTkQgbWFjcm9zLgoK
ICAgIG1vZGlmaWVkOgogICAgICBpbmNsdWRlL215X21kNS5oCiAgICAgIHNxbC9tZDUuY2MKIDM4
NDYgVG9yIERpZHJpa3NlbgkyMDEyLTAzLTIzCiAgICAgIEZpeCBicm9rZW4gYnVpbGQgb24gTWFj
ICh3aXRoIE1ZU1FMX01BSU5UQUlORVJfTU9ERSkKICAgICAgc3FsX3ZpZXcuY2M6IEluIGZ1bmN0
aW9uIOKAmGJvb2wgbXlzcWxfbWFrZV92aWV3KFRIRCosIEZpbGVfcGFyc2VyKiwgVEFCTEVfTElT
VCosIHVpbnQp4oCZOgogICAgICBzcWxfdmlldy5jYzoxMTA3OiB3YXJuaW5nOiDigJhyZXN1bHTi
gJkgbWF5IGJlIHVzZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1bmN0aW9uCiAgICAgIHNxbF92
aWV3LmNjOjExMDY6IHdhcm5pbmc6IOKAmHBhcnNlX3N0YXR1c+KAmSBtYXkgYmUgdXNlZCB1bmlu
aXRpYWxpemVkIGluIHRoaXMgZnVuY3Rpb24KICAgICAgc3FsX3ZpZXcuY2M6MTEwMjogd2Fybmlu
Zzog4oCYdmlld19zZWxlY3TigJkgbWF5IGJlIHVzZWQgdW5pbml0aWFsaXplZCBpbiB0aGlzIGZ1
bmN0aW9uCgogICAgbW9kaWZpZWQ6CiAgICAgIHNxbC9zcWxfdmlldy5jYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnaW5jbHVkZS9teV9tZDUuaCcKLS0tIGEvaW5jbHVkZS9teV9tZDUuaAkyMDEyLTAzLTA2
IDE0OjI5OjQyICswMDAwCisrKyBiL2luY2x1ZGUvbXlfbWQ1LmgJMjAxMi0wMy0yMyAxNDozMjow
OSArMDAwMApAQCAtMjksMTEgKzI5LDE2IEBACiAKICNpZiBkZWZpbmVkKEhBVkVfWUFTU0wpCiAK
LUNfTU9ERV9TVEFSVAorI2lmZGVmIF9fY3BsdXNwbHVzCitleHRlcm4gIkMiIHsKKyNlbmRpZgog
CiB2b2lkIG15X21kNV9oYXNoKGNoYXIgKmRpZ2VzdCwgY29uc3QgY2hhciAqYnVmLCBpbnQgbGVu
KTsKIAotQ19NT0RFX0VORAorI2lmZGVmIF9fY3BsdXNwbHVzCit9CisjZW5kaWYKKwogCiAjZWxz
ZSAvKiBIQVZFX1lBU1NMICovCiAKQEAgLTY1LDcgKzcwLDkgQEAgdHlwZWRlZiBzdHJ1Y3Qgewog
ICB1bnNpZ25lZCBjaGFyIGluWzY0XTsKIH0gbXlfTUQ1Q29udGV4dDsKIAotQ19NT0RFX1NUQVJU
CisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIgeworI2VuZGlmCiAKIHZvaWQgbXlfTUQ1
SW5pdCAobXlfTUQ1Q29udGV4dCAqY29udGV4dCk7CiB2b2lkIG15X01ENVVwZGF0ZSAobXlfTUQ1
Q29udGV4dCAqY29udGV4dCwKQEAgLTczLDcgKzgwLDEwIEBAIHZvaWQgbXlfTUQ1VXBkYXRlICht
eV9NRDVDb250ZXh0ICpjb250ZXgKIHZvaWQgbXlfTUQ1RmluYWwgKHVuc2lnbmVkIGNoYXIgZGln
ZXN0WzE2XSwKICAgICAgICAgICAgICAgICAgIG15X01ENUNvbnRleHQgKmNvbnRleHQpOwogCi1D
X01PREVfRU5ECisjaWZkZWYgX19jcGx1c3BsdXMKK30KKyNlbmRpZgorCiAKICNkZWZpbmUgTVlf
TUQ1X0hBU0goZGlnZXN0LGJ1ZixsZW4pIFwKIGRvIHsgXApAQCAtODUsMTAgKzk1LDE0IEBAIGRv
IHsgXAogCiAjZW5kaWYgLyogZGVmaW5lZChIQVZFX1lBU1NMKSB8fCBkZWZpbmVkKEhBVkVfT1BF
TlNTTCkgKi8KIAotQ19NT0RFX1NUQVJUCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4dGVybiAiQyIg
eworI2VuZGlmCiAKIHZvaWQgY29tcHV0ZV9tZDVfaGFzaChjaGFyICpkaWdlc3QsIGNvbnN0IGNo
YXIgKmJ1ZiwgaW50IGxlbik7CiAKLUNfTU9ERV9FTkQKKyNpZmRlZiBfX2NwbHVzcGx1cworfQor
I2VuZGlmCiAKICNlbmRpZiAvKiBNWV9NRDVfSU5DTFVERUQgKi8KCj09PSBtb2RpZmllZCBmaWxl
ICdzcWwvbWQ1LmNjJwotLS0gYS9zcWwvbWQ1LmNjCTIwMTItMDItMTcgMTA6MzA6MzEgKzAwMDAK
KysrIGIvc3FsL21kNS5jYwkyMDEyLTAzLTIzIDE0OjMyOjA5ICswMDAwCkBAIC0yMyw3ICsyMyw2
IEBACiAgIHRvIG1ha2UgYXZhaWxhYmxlIFlhU1NMJ3MgTUQ1IGltcGxlbWVudGF0aW9uLgogKi8K
IAotI2luY2x1ZGUgPG15X2dsb2JhbC5oPgogI2luY2x1ZGUgPG15X21kNS5oPgogCiAjaWZkZWYg
SEFWRV9ZQVNTTAoKTm8gYnVuZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=