From: marko.makela
Date: June 1 2010 2:03pm
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3133)
List-Archive: http://lists.mysql.com/commits/109770
Message-Id: <201006011404.o51Bsb1t012042@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1163736236=="

--===============1163736236==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: inline

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDphbGlrQHN1bi5jb20tMjAxMDA2MDExMjM4MDEteTlxdjdpZ28xNm53MHVt
bgoKIDMxMzMgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMQogICAgICBNZXJnZSBhIGNoYW5nZSBm
cm9tIG15c3FsLTUuMS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAz
NDkxCiAgICAgICAgcmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAx
MTM0MzM1LWNjdGh3d3J1MjNrbjA5cXcKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNjAxMTIwNzUxLTF1cTdiYnRhNW43dHMwcXIKICAgICAgICBjb21taXR0ZXI6
IE1hcmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2gg
bmljazogNS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogVHVlIDIwMTAtMDYtMDEgMTY6NDM6
MzUgKzAzMDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgQnVnIzQ4MTk3OiBDb25jdXJyZW50
IHJ3X2xvY2tfZnJlZSBtYXkgY2F1c2UgYXNzZXJ0aW9uIGZhaWx1cmUKICAgICAgCiAgICAgICAg
ICByd19sb2NrX3Q6IFJlbW92ZSBtYWdpY19uIHVubGVzcyBVTklWX0RFQlVHIGlzIGRlZmluZWQu
CiAgICAgICAgICByd19sb2NrX2ZyZWUoKTogSW52YWxpZGF0ZSBtYWdpY19uIG9ubHkgYWZ0ZXIg
cmVtb3ZpbmcgZnJvbSByd19sb2NrX2xpc3QuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9zeW5jMHJ3LmgKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5
bmMwcncuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMw
cncuaCcKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3N5bmMwcncuaAlyZXZpZDphbGlr
QHN1bi5jb20tMjAxMDA2MDExMjM4MDEteTlxdjdpZ28xNm53MHVtbgorKysgYi9zdG9yYWdlL2lu
bm9iYXNlL2luY2x1ZGUvc3luYzBydy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNjAxMTQwMzU1LXUza3hsMHlsMGxqbDV0eDkKQEAgLTYyMiwxMSArNjIyLDEyIEBAIHN0cnVj
dCByd19sb2NrX3N0cnVjdCB7CiAJdW5zaWduZWQJY2xpbmU6MTQ7CS8qITwgTGluZSB3aGVyZSBj
cmVhdGVkICovCiAJdW5zaWduZWQJbGFzdF9zX2xpbmU6MTQ7CS8qITwgTGluZSBudW1iZXIgd2hl
cmUgbGFzdCB0aW1lIHMtbG9ja2VkICovCiAJdW5zaWduZWQJbGFzdF94X2xpbmU6MTQ7CS8qITwg
TGluZSBudW1iZXIgd2hlcmUgbGFzdCB0aW1lIHgtbG9ja2VkICovCisjaWZkZWYgVU5JVl9ERUJV
RwogCXVsaW50CW1hZ2ljX247CS8qITwgUldfTE9DS19NQUdJQ19OICovCi19OwotCiAvKiogVmFs
dWUgb2YgcndfbG9ja19zdHJ1Y3Q6Om1hZ2ljX24gKi8KICNkZWZpbmUJUldfTE9DS19NQUdJQ19O
CTIyNjQzCisjZW5kaWYgLyogVU5JVl9ERUJVRyAqLworfTsKIAogI2lmZGVmIFVOSVZfU1lOQ19E
RUJVRwogLyoqIFRoZSBzdHJ1Y3R1cmUgZm9yIHN0b3JpbmcgZGVidWcgaW5mbyBvZiBhbiBydy1s
b2NrICovCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncu
YycKLS0tIGEvc3RvcmFnZS9pbm5vYmFzZS9zeW5jL3N5bmMwcncuYwlyZXZpZDphbGlrQHN1bi5j
b20tMjAxMDA2MDExMjM4MDEteTlxdjdpZ28xNm53MHVtbgorKysgYi9zdG9yYWdlL2lubm9iYXNl
L3N5bmMvc3luYzBydy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTQw
MzU1LXUza3hsMHlsMGxqbDV0eDkKQEAgLTI3OCw3ICsyNzgsNyBAQCByd19sb2NrX2NyZWF0ZV9m
dW5jKAogCWxvY2stPmxldmVsID0gbGV2ZWw7CiAjZW5kaWYgLyogVU5JVl9TWU5DX0RFQlVHICov
CiAKLQlsb2NrLT5tYWdpY19uID0gUldfTE9DS19NQUdJQ19OOworCXV0X2QobG9jay0+bWFnaWNf
biA9IFJXX0xPQ0tfTUFHSUNfTik7CiAKIAlsb2NrLT5jZmlsZV9uYW1lID0gY2ZpbGVfbmFtZTsK
IAlsb2NrLT5jbGluZSA9ICh1bnNpZ25lZCBpbnQpIGNsaW5lOwpAQCAtMjkzLDEwICsyOTMsOCBA
QCByd19sb2NrX2NyZWF0ZV9mdW5jKAogCiAJbXV0ZXhfZW50ZXIoJnJ3X2xvY2tfbGlzdF9tdXRl
eCk7CiAKLQlpZiAoVVRfTElTVF9HRVRfTEVOKHJ3X2xvY2tfbGlzdCkgPiAwKSB7Ci0JCXV0X2Eo
VVRfTElTVF9HRVRfRklSU1QocndfbG9ja19saXN0KS0+bWFnaWNfbgotCQkgICAgID09IFJXX0xP
Q0tfTUFHSUNfTik7Ci0JfQorCXV0X2FkKFVUX0xJU1RfR0VUX0ZJUlNUKHJ3X2xvY2tfbGlzdCkg
PT0gTlVMTAorCSAgICAgIHx8IFVUX0xJU1RfR0VUX0ZJUlNUKHJ3X2xvY2tfbGlzdCktPm1hZ2lj
X24gPT0gUldfTE9DS19NQUdJQ19OKTsKIAogCVVUX0xJU1RfQUREX0ZJUlNUKGxpc3QsIHJ3X2xv
Y2tfbGlzdCwgbG9jayk7CiAKQEAgLTMxNiw4ICszMTQsNiBAQCByd19sb2NrX2ZyZWVfZnVuYygK
IAl1dF9hZChyd19sb2NrX3ZhbGlkYXRlKGxvY2spKTsKIAl1dF9hKGxvY2stPmxvY2tfd29yZCA9
PSBYX0xPQ0tfREVDUik7CiAKLQlsb2NrLT5tYWdpY19uID0gMDsKLQogI2lmbmRlZiBJTk5PREJf
UldfTE9DS1NfVVNFX0FUT01JQ1MKIAltdXRleF9mcmVlKHJ3X2xvY2tfZ2V0X211dGV4KGxvY2sp
KTsKICNlbmRpZiAvKiBJTk5PREJfUldfTE9DS1NfVVNFX0FUT01JQ1MgKi8KQEAgLTMyNywxNiAr
MzIzLDE2IEBAIHJ3X2xvY2tfZnJlZV9mdW5jKAogCiAJb3NfZXZlbnRfZnJlZShsb2NrLT53YWl0
X2V4X2V2ZW50KTsKIAotCWlmIChVVF9MSVNUX0dFVF9QUkVWKGxpc3QsIGxvY2spKSB7Ci0JCXV0
X2EoVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01BR0lD
X04pOwotCX0KLQlpZiAoVVRfTElTVF9HRVRfTkVYVChsaXN0LCBsb2NrKSkgewotCQl1dF9hKFVU
X0xJU1RfR0VUX05FWFQobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsK
LQl9CisJdXRfYWQoVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKSA9PSBOVUxMCisJICAgICAg
fHwgVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKS0+bWFnaWNfbiA9PSBSV19MT0NLX01BR0lD
X04pOworCXV0X2FkKFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jaykgPT0gTlVMTAorCSAgICAg
IHx8IFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJ
Q19OKTsKIAogCVVUX0xJU1RfUkVNT1ZFKGxpc3QsIHJ3X2xvY2tfbGlzdCwgbG9jayk7CiAKIAlt
dXRleF9leGl0KCZyd19sb2NrX2xpc3RfbXV0ZXgpOworCisJdXRfZChsb2NrLT5tYWdpY19uID0g
MCk7CiB9CiAKICNpZmRlZiBVTklWX0RFQlVHCkBAIC0zNTgsNyArMzU0LDcgQEAgcndfbG9ja192
YWxpZGF0ZSgKIAl3YWl0ZXJzID0gcndfbG9ja19nZXRfd2FpdGVycyhsb2NrKTsKIAlsb2NrX3dv
cmQgPSBsb2NrLT5sb2NrX3dvcmQ7CiAKLQl1dF9hKGxvY2stPm1hZ2ljX24gPT0gUldfTE9DS19N
QUdJQ19OKTsKKwl1dF9hZChsb2NrLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAJdXRf
YSh3YWl0ZXJzID09IDAgfHwgd2FpdGVycyA9PSAxKTsKIAl1dF9hKGxvY2tfd29yZCA+IC1YX0xP
Q0tfREVDUiB8fCgtbG9ja193b3JkKSAlIFhfTE9DS19ERUNSID09IDApOwogCgo=

--===============1163736236==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marko.makela@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marko.makela@stripped
# target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# testament_sha1: e64b568691e5d7cba3f63b16b53081d43059d442
# timestamp: 2010-06-01 17:04:03 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: alik@stripped
# 
# Begin bundle
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
gpBjAkg9lFwU96/y9viEjgP+LuSKcKEgeTMiJA==


--===============1163736236==--