From: marko.makela
Date: August 21 2012 8:22am
Subject: bzr push into mysql-trunk branch (marko.makela:4261 to 4262)
List-Archive: http://lists.mysql.com/commits/144582
Message-Id: <20120821082236.30726.47282.4262@x220>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

IDQyNjIgTWFya28gTcOka2Vsw6QJMjAxMi0wOC0yMSBbbWVyZ2VdCiAgICAgIE1lcmdlIG15c3Fs
LTUuNiB0byBteXNxbC10cnVuay4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFz
ZS9pYnVmL2lidWYwaWJ1Zi5jYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmNj
CiA0MjYxIE5vcnZhbGQgSC4gUnllbmcJMjAxMi0wOC0yMSBbbWVyZ2VdCiAgICAgIE51bGwgbWVy
Z2UgNS42LT50cnVuay4KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2lidWYv
aWJ1ZjBpYnVmLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2lidWYvaWJ1ZjBpYnVmLmNjCXJl
dmlkOm5vcnZhbGQucnllbmdAb3JhY2xlLmNvbS0yMDEyMDgyMTA4MDE0MS04dXl2c3p5MXhuN2I5
ZjR3CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaWJ1Zi9pYnVmMGlidWYuY2MJcmV2aWQ6bWFya28u
bWFrZWxhQG9yYWNsZS5jb20tMjAxMjA4MjEwODIxMjItcWQ2bTMzY3pheDE5eWI5MgpAQCAtMzcw
MSwxMSArMzcwMSwyMCBAQCBmYWlsX2V4aXQ6CiAKIAkJcm9vdCA9IGlidWZfdHJlZV9yb290X2dl
dCgmbXRyKTsKIAotCQllcnIgPSBidHJfY3VyX3Blc3NpbWlzdGljX2luc2VydCgKKwkJZXJyID0g
YnRyX2N1cl9vcHRpbWlzdGljX2luc2VydCgKIAkJCUJUUl9OT19MT0NLSU5HX0ZMQUcgfCBCVFJf
Tk9fVU5ET19MT0dfRkxBRywKIAkJCWN1cnNvciwgJm9mZnNldHMsICZvZmZzZXRzX2hlYXAsCiAJ
CQlpYnVmX2VudHJ5LCAmaW5zX3JlYywKIAkJCSZkdW1teV9iaWdfcmVjLCAwLCB0aHIsICZtdHIp
OworCisJCWlmIChlcnIgPT0gREJfRkFJTCkgeworCQkJZXJyID0gYnRyX2N1cl9wZXNzaW1pc3Rp
Y19pbnNlcnQoCisJCQkJQlRSX05PX0xPQ0tJTkdfRkxBRyB8IEJUUl9OT19VTkRPX0xPR19GTEFH
LAorCQkJCWN1cnNvciwgJm9mZnNldHMsICZvZmZzZXRzX2hlYXAsCisJCQkJaWJ1Zl9lbnRyeSwg
Jmluc19yZWMsCisJCQkJJmR1bW15X2JpZ19yZWMsIDAsIHRociwgJm10cik7CisJCX0KKwogCQlt
dXRleF9leGl0KCZpYnVmX3Blc3NpbWlzdGljX2luc2VydF9tdXRleCk7CiAJCWlidWZfc2l6ZV91
cGRhdGUocm9vdCwgJm10cik7CiAJCW11dGV4X2V4aXQoJmlidWZfbXV0ZXgpOwoKPT09IG1vZGlm
aWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MnCi0tLSBhL3N0b3JhZ2Uv
aW5ub2Jhc2Uvcm93L3JvdzBpbnMuY2MJcmV2aWQ6bm9ydmFsZC5yeWVuZ0BvcmFjbGUuY29tLTIw
MTIwODIxMDgwMTQxLTh1eXZzenkxeG43YjlmNHcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MGlucy5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEyMDgyMTA4MjEyMi1x
ZDZtMzNjemF4MTl5YjkyCkBAIC0yMzM0LDE3ICsyMzM0LDEzIEBAIGVycl9leGl0OgogCQkJCWdv
dG8gZXJyX2V4aXQ7CiAJCQl9CiAKLQkJCWlmIChmbGFncyAmIEJUUl9DUkVBVEVfRkxBRykgewot
CQkJCWVyciA9IGJ0cl9jdXJfb3B0aW1pc3RpY19pbnNlcnQoCi0JCQkJCWZsYWdzLCAmY3Vyc29y
LAotCQkJCQkmb2Zmc2V0cywgJm9mZnNldHNfaGVhcCwKLQkJCQkJZW50cnksICZpbnNlcnRfcmVj
LCAmYmlnX3JlYywKLQkJCQkJbl9leHQsIHRociwgJm10cik7Ci0JCQkJaWYgKGVyciA9PSBEQl9G
QUlMKSB7Ci0JCQkJCWdvdG8gcGVzc2ltaXN0aWNfaW5zZXJ0OwotCQkJCX0KLQkJCX0gZWxzZSB7
Ci1wZXNzaW1pc3RpY19pbnNlcnQ6CisJCQllcnIgPSBidHJfY3VyX29wdGltaXN0aWNfaW5zZXJ0
KAorCQkJCWZsYWdzLCAmY3Vyc29yLAorCQkJCSZvZmZzZXRzLCAmb2Zmc2V0c19oZWFwLAorCQkJ
CWVudHJ5LCAmaW5zZXJ0X3JlYywgJmJpZ19yZWMsCisJCQkJbl9leHQsIHRociwgJm10cik7CisK
KwkJCWlmIChlcnIgPT0gREJfRkFJTCkgewogCQkJCWVyciA9IGJ0cl9jdXJfcGVzc2ltaXN0aWNf
aW5zZXJ0KAogCQkJCQlmbGFncywgJmN1cnNvciwKIAkJCQkJJm9mZnNldHMsICZvZmZzZXRzX2hl
YXAsCkBAIC0yNTMzLDE3ICsyNTI5LDE1IEBAIHJvd19pbnNfc2VjX2luZGV4X2VudHJ5X2xvdygK
IAkJCWlmIChidWZfTFJVX2J1Zl9wb29sX3J1bm5pbmdfb3V0KCkpIHsKIAogCQkJCWVyciA9IERC
X0xPQ0tfVEFCTEVfRlVMTDsKLQkJCX0gZWxzZSBpZiAoZmxhZ3MgJiBCVFJfQ1JFQVRFX0ZMQUcp
IHsKLQkJCQllcnIgPSBidHJfY3VyX29wdGltaXN0aWNfaW5zZXJ0KAotCQkJCQlmbGFncywgJmN1
cnNvciwKLQkJCQkJJm9mZnNldHMsICZvZmZzZXRzX2hlYXAsCi0JCQkJCWVudHJ5LCAmaW5zZXJ0
X3JlYywKLQkJCQkJJmJpZ19yZWMsIDAsIHRociwgJm10cik7Ci0JCQkJaWYgKGVyciA9PSBEQl9G
QUlMKSB7Ci0JCQkJCWdvdG8gcGVzc2ltaXN0aWNfaW5zZXJ0OwotCQkJCX0KLQkJCX0gZWxzZSB7
Ci1wZXNzaW1pc3RpY19pbnNlcnQ6CisJCQkJZ290byBmdW5jX2V4aXQ7CisJCQl9CisKKwkJCWVy
ciA9IGJ0cl9jdXJfb3B0aW1pc3RpY19pbnNlcnQoCisJCQkJZmxhZ3MsICZjdXJzb3IsCisJCQkJ
Jm9mZnNldHMsICZvZmZzZXRzX2hlYXAsCisJCQkJZW50cnksICZpbnNlcnRfcmVjLAorCQkJCSZi
aWdfcmVjLCAwLCB0aHIsICZtdHIpOworCQkJaWYgKGVyciA9PSBEQl9GQUlMKSB7CiAJCQkJZXJy
ID0gYnRyX2N1cl9wZXNzaW1pc3RpY19pbnNlcnQoCiAJCQkJCWZsYWdzLCAmY3Vyc29yLAogCQkJ
CQkmb2Zmc2V0cywgJm9mZnNldHNfaGVhcCwKCk5vIGJ1bmRsZSAocmVhc29uOiB1c2VsZXNzIGZv
ciBwdXNoIGVtYWlscyku