From: marko.makela
Date: May 4 2010 9:31am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3437) Bug#52964
List-Archive: http://lists.mysql.com/commits/107267
X-Bug: 52964
Message-Id: <201005040931.o449OQZt023732@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0494320260=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MDMxMjI4NTktazczYmw1
MXJlOTNvMG10NAoKIDM0MzcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBidHJfcGFn
ZV9zcGxpdF9hbmRfaW5zZXJ0KCk6IENvcnJlY3QgdGhlIGZpeCBvZiBCdWcgIzUyOTY0LgogICAg
ICBXaGVuIHNwbGl0X3JlYz09TlVMTCwgY2hvb3NlIHRoZSBjb3JyZWN0IG5vZGUgcG9pbnRlciBr
ZXkgKGZpcnN0X3JlYykuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9idHIvYnRyMGJ0ci5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnRyL2J0cjBidHIuYycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRyLmMJ
MjAxMC0wNC0yNiAwNzozOTo0OSArMDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnRy
L2J0cjBidHIuYwkyMDEwLTA1LTA0IDA5OjMxOjI4ICswMDAwCkBAIC0xOTk5LDkgKzE5OTksMTMg
QEAgZnVuY19zdGFydDoKIAkJCXNwbGl0X3JlYyA9IE5VTEw7CiAJCQlnb3RvIGluc2VydF9lbXB0
eTsKIAkJfQorCX0gZWxzZSBpZiAoVU5JVl9VTkxJS0VMWShpbnNlcnRfbGVmdCkpIHsKKwkJZmly
c3RfcmVjID0gcGFnZV9yZWNfZ2V0X25leHQocGFnZV9nZXRfaW5maW11bV9yZWMocGFnZSkpOwor
CQltb3ZlX2xpbWl0ID0gcGFnZV9yZWNfZ2V0X25leHQoYnRyX2N1cl9nZXRfcmVjKGN1cnNvcikp
OwogCX0gZWxzZSB7CiBpbnNlcnRfZW1wdHk6CiAJCXV0X2FkKCFzcGxpdF9yZWMpOworCQl1dF9h
ZCghaW5zZXJ0X2xlZnQpOwogCQlidWYgPSBtZW1fYWxsb2MocmVjX2dldF9jb252ZXJ0ZWRfc2l6
ZShjdXJzb3ItPmluZGV4LAogCQkJCQkJICAgICAgIHR1cGxlLCBuX2V4dCkpOwogCkBAIC0yMDI1
LDcgKzIwMjksMTEgQEAgaW5zZXJ0X2VtcHR5OgogCQkJJiYgYnRyX3BhZ2VfaW5zZXJ0X2ZpdHMo
Y3Vyc29yLCBzcGxpdF9yZWMsCiAJCQkJCQlvZmZzZXRzLCB0dXBsZSwgbl9leHQsIGhlYXApOwog
CX0gZWxzZSB7Ci0JCW1lbV9mcmVlKGJ1Zik7CisJCWlmICghaW5zZXJ0X2xlZnQpIHsKKwkJCW1l
bV9mcmVlKGJ1Zik7CisJCQlidWYgPSBOVUxMOworCQl9CisKIAkJaW5zZXJ0X3dpbGxfZml0ID0g
IW5ld19wYWdlX3ppcAogCQkJJiYgYnRyX3BhZ2VfaW5zZXJ0X2ZpdHMoY3Vyc29yLCBOVUxMLAog
CQkJCQkJTlVMTCwgdHVwbGUsIG5fZXh0LCBoZWFwKTsKCg==

--===============0494320260==
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/mysql/5.1-innodb/
# testament_sha1: c037572924eafecf228d86129d9293d2b0f1c8ec
# timestamp: 2010-05-04 12:31:36 +0300
# base_revision_id: marko.makela@stripped\
#   k73bl51re93o0mt4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUFjVUcAAeHfgEAwe2f//1sv
A6C/7//6UARYVe7TrO2bbLtzXYSRITE0maaaZFPIxT9CmaIaeo9TRoPSHqAkkhkyT1M1MmjUZIaA
ZAGj1AAGgYiEKn+qn4TUemptAo9QeofqgA9Q09QA9Qc0xMmTRhMExNMAmAQwRgRgEkpoU9MEh6eo
T1ME9Jp6g0ABoBoGlrh0EiiVl0GlupYf7KO+Ipbn7eQ3wMwjJWY7n1xBFog1D1qHcr5DpRiLbEkB
9e0/qEpsW8DYGTqDwnRU3i08eFfbktC53hvo35i1nSExChWITQehhtHEZ46lswFeb7Nie4gNqwcA
eUeNzUPvy/ERlgy03PzTQ7yxUpxxykJeUE9AiYX5Xao4LNdEubQ9VslGFYki5Iz1GrZHxRPRIAMl
NbiLiQmCBGJVpTlgUCIneGlSFFgD4Vv+CpWQWBTMM3CuAjadfdBMuZE4sOLHXIcjknkZTTyF57XC
UcpDGOExrlKVtQX50MIYc1xd5A4wotKnGThVowVzVBlybkiUmtdCK3i3byYQHrAQvaDEoEbkydQH
UZdI9UlhAWMZjIKigvDT2DixY+uZ+sRZXXQOzWg2y8y0vIkbzMeuOVhcnJ62rhTfmztWDnmsthUW
OgV71opGiXb2iwmRWv46LZ6lK1SGWqw5jQMBdOmxlNwZHTHcUOsSDSN/dg4hE0mUYCsVylnURKjT
rha09mpMaKuZcD5KJ52Ku6zcORtYWpjOshdkKphtsZF3sreOneeHSErksHhlW5IfEyY+9I/ORFvp
6OP+iWWiBihGcuk1E/8tLPKmwhFCtM9rg6ZiFiNhxFf7ocLRVkIWECmNBakbHFpmupD5CbpLLxng
yokcthSyVL+9EXzkJddFQzgbUx7DqUsNnRd6YfV2/t+GwWhxlSifsRpUSqIGJVKo/0un377IMkN1
JECg00vJTrJ06bATifzoV4dvFZynsvik1QbPO1PtECflJha3VmooNCqt0E5RulrrowamVUqDgbxN
eQXwBdydr5JkXbr3bkZhwMJKtwWgYkFN8DXnrfAsugY2RmYsTZic/Gq0p27IWxOvXQvpdUljSL0g
bgvnGaLMgmYGxE+x1SIchPfoFCPq3x+EIiyCLKEk+CD+rbLBijkeBKYAM1AzoXPLypX3iSJdsMAL
r2q+oQSLOefAkMpQ2l/XLqp2imzJEcnckY9fgx5jFXmscH23nXXGVQ4mXYpWonUM86pAKPYHD7Os
vtq3OCZmTMhlBnBaVGP2sdYKQDi0xos+kjjChSbJVrI57Wn5BjNujo4rGBuFIJFuquMRtOzjnzV0
WphVJotUkn+lUS3Gboin1YXsqpveC8upTroFRfzlonQkWLMEuocYY4gSmC4mKgAqjf4XupEAqCLa
dZZ0m1Q5l46RMZUhJMYs1dw5rKXkmMYjiAPWiQ1KYjZT7IFchccWDJkkXUKis3bhU4VJ41gT8Mej
LGDYySyGUhweV+oaB/xdyRThQkEFjVUc


--===============0494320260==--