From: marko.makela
Date: June 1 2010 1:58pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3490 to 3492) Bug#48197
List-Archive: http://lists.mysql.com/commits/109768
X-Bug: 48197
Message-Id: <201006011358.o51Bsb11012042@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1124562179=="

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

IDM0OTIgTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMQogICAgICBEb2N1bWVudCBCdWcgIzQ4MTk3
IGZpeAoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9n
CiAzNDkxIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDEKICAgICAgQnVnIzQ4MTk3OiBDb25jdXJy
ZW50IHJ3X2xvY2tfZnJlZSBtYXkgY2F1c2UgYXNzZXJ0aW9uIGZhaWx1cmUKICAgICAgCiAgICAg
IHJ3X2xvY2tfdDogUmVtb3ZlIG1hZ2ljX24gdW5sZXNzIFVOSVZfREVCVUcgaXMgZGVmaW5lZC4K
ICAgICAgcndfbG9ja19mcmVlKCk6IEludmFsaWRhdGUgbWFnaWNfbiBvbmx5IGFmdGVyIHJlbW92
aW5nIGZyb20gcndfbG9ja19saXN0LgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9k
Yl9wbHVnaW4vaW5jbHVkZS9zeW5jMHJ3LmgKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5
bmMvc3luYzBydy5jCiAzNDkwIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDEKICAgICAgTWlub3Ig
Y2xlYW51cC4KICAgICAgCiAgICAgIGxvY2tfcmVjX3VubG9jaygpOiBDYWNoZSBmaXJzdF9sb2Nr
IGFuZCByZXdyaXRlIHdoaWxlKCkgbG9vcHMgYXMgZm9yKCkuCiAgICAgIAogICAgICBidHJfY3Vy
X29wdGltaXN0aWNfdXBkYXRlKCk6IFVzZSBjb21tb24gZXJyb3IgaGFuZGxpbmcgcmV0dXJuLgog
ICAgICAKICAgICAgcm93X2NyZWF0ZV9wcmVidWlsdCgpOiBBZGQgVmFsZ3JpbmQgaW5zdHJ1bWVu
dGF0aW9uLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRyL2J0
cjBjdXIuYwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vbG9jay9sb2NrMGxvY2suYwogICAg
ICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzBteXNxbC5jCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nJwotLS0gYS9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vQ2hhbmdlTG9nCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTIw
NzUxLTF1cTdiYnRhNW43dHMwcXIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxv
ZwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMTEzNTgwMi1oZ3BsY3ByODA4
OXVyYThnCkBAIC0xLDUgKzEsMTAgQEAKIDIwMTAtMDYtMDEJVGhlIElubm9EQiBUZWFtCiAKKwkq
IGluY2x1ZGUvc3luYzBydy5oLCBzeW5jL3N5bmMwcncuYzoKKwlGaXggQnVnIzQ4MTk3IENvbmN1
cnJlbnQgcndfbG9ja19mcmVlIG1heSBjYXVzZSBhc3NlcnRpb24gZmFpbHVyZQorCisyMDEwLTA2
LTAxCVRoZSBJbm5vREIgVGVhbQorCiAJKiByb3cvcm93MHVtb2QuYzoKIAlGaXggQnVnIzUzODEy
IGFzc2VydCByb3cvcm93MHVtb2QuYyBsaW5lIDY2MCBpbiB0eG4gcm9sbGJhY2sKIAlhZnRlciBj
cmFzaCByZWNvdmVyeQoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9p
bmNsdWRlL3N5bmMwcncuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvc3lu
YzBydy5oCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTIwNzUxLTF1cTdi
YnRhNW43dHMwcXIKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvc3luYzBydy5o
CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNjAxMTM1ODAyLWhncGxjcHI4MDg5
dXJhOGcKQEAgLTU1NSwxMSArNTU1LDEyIEBAIHN0cnVjdCByd19sb2NrX3N0cnVjdCB7CiAJdW5z
aWduZWQJY2xpbmU6MTQ7CS8qITwgTGluZSB3aGVyZSBjcmVhdGVkICovCiAJdW5zaWduZWQJbGFz
dF9zX2xpbmU6MTQ7CS8qITwgTGluZSBudW1iZXIgd2hlcmUgbGFzdCB0aW1lIHMtbG9ja2VkICov
CiAJdW5zaWduZWQJbGFzdF94X2xpbmU6MTQ7CS8qITwgTGluZSBudW1iZXIgd2hlcmUgbGFzdCB0
aW1lIHgtbG9ja2VkICovCisjaWZkZWYgVU5JVl9ERUJVRwogCXVsaW50CW1hZ2ljX247CS8qITwg
UldfTE9DS19NQUdJQ19OICovCi19OwotCiAvKiogVmFsdWUgb2YgcndfbG9ja19zdHJ1Y3Q6Om1h
Z2ljX24gKi8KICNkZWZpbmUJUldfTE9DS19NQUdJQ19OCTIyNjQzCisjZW5kaWYgLyogVU5JVl9E
RUJVRyAqLworfTsKIAogI2lmZGVmIFVOSVZfU1lOQ19ERUJVRwogLyoqIFRoZSBzdHJ1Y3R1cmUg
Zm9yIHN0b3JpbmcgZGVidWcgaW5mbyBvZiBhbiBydy1sb2NrICovCgo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3N5bmMvc3luYzBydy5jJwotLS0gYS9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vc3luYy9zeW5jMHJ3LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMDA2MDExMjA3NTEtMXVxN2JidGE1bjd0czBxcgorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVn
aW4vc3luYy9zeW5jMHJ3LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA2MDEx
MzU4MDItaGdwbGNwcjgwODl1cmE4ZwpAQCAtMjY3LDcgKzI2Nyw3IEBAIHJ3X2xvY2tfY3JlYXRl
X2Z1bmMoCiAJbG9jay0+bGV2ZWwgPSBsZXZlbDsKICNlbmRpZiAvKiBVTklWX1NZTkNfREVCVUcg
Ki8KIAotCWxvY2stPm1hZ2ljX24gPSBSV19MT0NLX01BR0lDX047CisJdXRfZChsb2NrLT5tYWdp
Y19uID0gUldfTE9DS19NQUdJQ19OKTsKIAogCWxvY2stPmNmaWxlX25hbWUgPSBjZmlsZV9uYW1l
OwogCWxvY2stPmNsaW5lID0gKHVuc2lnbmVkIGludCkgY2xpbmU7CkBAIC0yODIsMTAgKzI4Miw4
IEBAIHJ3X2xvY2tfY3JlYXRlX2Z1bmMoCiAKIAltdXRleF9lbnRlcigmcndfbG9ja19saXN0X211
dGV4KTsKIAotCWlmIChVVF9MSVNUX0dFVF9MRU4ocndfbG9ja19saXN0KSA+IDApIHsKLQkJdXRf
YShVVF9MSVNUX0dFVF9GSVJTVChyd19sb2NrX2xpc3QpLT5tYWdpY19uCi0JCSAgICAgPT0gUldf
TE9DS19NQUdJQ19OKTsKLQl9CisJdXRfYWQoVVRfTElTVF9HRVRfRklSU1QocndfbG9ja19saXN0
KSA9PSBOVUxMCisJICAgICAgfHwgVVRfTElTVF9HRVRfRklSU1QocndfbG9ja19saXN0KS0+bWFn
aWNfbiA9PSBSV19MT0NLX01BR0lDX04pOwogCiAJVVRfTElTVF9BRERfRklSU1QobGlzdCwgcndf
bG9ja19saXN0LCBsb2NrKTsKIApAQCAtMzA1LDggKzMwMyw2IEBAIHJ3X2xvY2tfZnJlZSgKIAl1
dF9hZChyd19sb2NrX3ZhbGlkYXRlKGxvY2spKTsKIAl1dF9hKGxvY2stPmxvY2tfd29yZCA9PSBY
X0xPQ0tfREVDUik7CiAKLQlsb2NrLT5tYWdpY19uID0gMDsKLQogI2lmbmRlZiBJTk5PREJfUldf
TE9DS1NfVVNFX0FUT01JQ1MKIAltdXRleF9mcmVlKHJ3X2xvY2tfZ2V0X211dGV4KGxvY2spKTsK
ICNlbmRpZiAvKiBJTk5PREJfUldfTE9DS1NfVVNFX0FUT01JQ1MgKi8KQEAgLTMxNiwxNiArMzEy
LDE2IEBAIHJ3X2xvY2tfZnJlZSgKIAogCW9zX2V2ZW50X2ZyZWUobG9jay0+d2FpdF9leF9ldmVu
dCk7CiAKLQlpZiAoVVRfTElTVF9HRVRfUFJFVihsaXN0LCBsb2NrKSkgewotCQl1dF9hKFVUX0xJ
U1RfR0VUX1BSRVYobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsKLQl9
Ci0JaWYgKFVUX0xJU1RfR0VUX05FWFQobGlzdCwgbG9jaykpIHsKLQkJdXRfYShVVF9MSVNUX0dF
VF9ORVhUKGxpc3QsIGxvY2spLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7Ci0JfQorCXV0
X2FkKFVUX0xJU1RfR0VUX1BSRVYobGlzdCwgbG9jaykgPT0gTlVMTAorCSAgICAgIHx8IFVUX0xJ
U1RfR0VUX1BSRVYobGlzdCwgbG9jayktPm1hZ2ljX24gPT0gUldfTE9DS19NQUdJQ19OKTsKKwl1
dF9hZChVVF9MSVNUX0dFVF9ORVhUKGxpc3QsIGxvY2spID09IE5VTEwKKwkgICAgICB8fCBVVF9M
SVNUX0dFVF9ORVhUKGxpc3QsIGxvY2spLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAK
IAlVVF9MSVNUX1JFTU9WRShsaXN0LCByd19sb2NrX2xpc3QsIGxvY2spOwogCiAJbXV0ZXhfZXhp
dCgmcndfbG9ja19saXN0X211dGV4KTsKKworCXV0X2QobG9jay0+bWFnaWNfbiA9IDApOwogfQog
CiAjaWZkZWYgVU5JVl9ERUJVRwpAQCAtMzQ0LDcgKzM0MCw3IEBAIHJ3X2xvY2tfdmFsaWRhdGUo
CiAJdWxpbnQgd2FpdGVycyA9IHJ3X2xvY2tfZ2V0X3dhaXRlcnMobG9jayk7CiAJbGludCBsb2Nr
X3dvcmQgPSBsb2NrLT5sb2NrX3dvcmQ7CiAKLQl1dF9hKGxvY2stPm1hZ2ljX24gPT0gUldfTE9D
S19NQUdJQ19OKTsKKwl1dF9hZChsb2NrLT5tYWdpY19uID09IFJXX0xPQ0tfTUFHSUNfTik7CiAJ
dXRfYSh3YWl0ZXJzID09IDAgfHwgd2FpdGVycyA9PSAxKTsKIAl1dF9hKGxvY2tfd29yZCA+IC1Y
X0xPQ0tfREVDUiB8fCgtbG9ja193b3JkKSAlIFhfTE9DS19ERUNSID09IDApOwogCgo=

--===============1124562179==
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.1-innodb/
# testament_sha1: 8c263f2caf370bab720e2b9ca48e1e8dc0753f53
# timestamp: 2010-06-01 16:58:48 +0300
# base_revision_id: marko.makela@stripped\
#   1uq7bbta5n7ts0qr
# 
# Begin bundle
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
xdyRThQkJZSB8YA=


--===============1124562179==--