From: marko.makela
Date: May 4 2010 10:01am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3436 to 3437) Bug#52964
List-Archive: http://lists.mysql.com/commits/107274
X-Bug: 52964
Message-Id: <201005041001.o449wMQo008529@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1421567172=="

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

IDM0MzcgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0wNAogICAgICBidHJfcGFnZV9zcGxpdF9hbmRf
aW5zZXJ0KCk6IENvcnJlY3QgdGhlIGZpeCBvZiBCdWcgIzUyOTY0LgogICAgICBXaGVuIHNwbGl0
X3JlYz09TlVMTCwgY2hvb3NlIHRoZSBjb3JyZWN0IG5vZGUgcG9pbnRlciBrZXkgKGZpcnN0X3Jl
YykuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0
ci5jCiAzNDM2IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMDMKICAgICAgYnVmX3ppcF9kZWNvbXBy
ZXNzKCk6IEFsbG93IEJVRl9OT19DSEVDS1NVTV9NQUdJQyBhcyB0aGUgc3RhbXBlZCBjaGVja3N1
bS4KICAgICAgYnVmX3BhZ2VfZ2V0X2dlbigpOiBBc3NlcnQgdGhhdCBidWZfemlwX2RlY29tcHJl
c3MoKSBzdWNjZWVkcy4KICAgICAgQ2FsbGVycyBhcmUgbm90IHByZXBhcmVkIGZvciBhIE5VTEwg
cmV0dXJuIHZhbHVlLiAoQnVnICM1MzI0OCkKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL0NoYW5nZUxvZwogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1
ZjBidWYuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIw
YnRyLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idHIvYnRyMGJ0ci5jCTIwMTAtMDQt
MjYgMDc6Mzk6NDkgKzAwMDAKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRy
LmMJMjAxMC0wNS0wNCAwOTozMToyOCArMDAwMApAQCAtMTk5OSw5ICsxOTk5LDEzIEBAIGZ1bmNf
c3RhcnQ6CiAJCQlzcGxpdF9yZWMgPSBOVUxMOwogCQkJZ290byBpbnNlcnRfZW1wdHk7CiAJCX0K
Kwl9IGVsc2UgaWYgKFVOSVZfVU5MSUtFTFkoaW5zZXJ0X2xlZnQpKSB7CisJCWZpcnN0X3JlYyA9
IHBhZ2VfcmVjX2dldF9uZXh0KHBhZ2VfZ2V0X2luZmltdW1fcmVjKHBhZ2UpKTsKKwkJbW92ZV9s
aW1pdCA9IHBhZ2VfcmVjX2dldF9uZXh0KGJ0cl9jdXJfZ2V0X3JlYyhjdXJzb3IpKTsKIAl9IGVs
c2UgewogaW5zZXJ0X2VtcHR5OgogCQl1dF9hZCghc3BsaXRfcmVjKTsKKwkJdXRfYWQoIWluc2Vy
dF9sZWZ0KTsKIAkJYnVmID0gbWVtX2FsbG9jKHJlY19nZXRfY29udmVydGVkX3NpemUoY3Vyc29y
LT5pbmRleCwKIAkJCQkJCSAgICAgICB0dXBsZSwgbl9leHQpKTsKIApAQCAtMjAyNSw3ICsyMDI5
LDExIEBAIGluc2VydF9lbXB0eToKIAkJCSYmIGJ0cl9wYWdlX2luc2VydF9maXRzKGN1cnNvciwg
c3BsaXRfcmVjLAogCQkJCQkJb2Zmc2V0cywgdHVwbGUsIG5fZXh0LCBoZWFwKTsKIAl9IGVsc2Ug
ewotCQltZW1fZnJlZShidWYpOworCQlpZiAoIWluc2VydF9sZWZ0KSB7CisJCQltZW1fZnJlZShi
dWYpOworCQkJYnVmID0gTlVMTDsKKwkJfQorCiAJCWluc2VydF93aWxsX2ZpdCA9ICFuZXdfcGFn
ZV96aXAKIAkJCSYmIGJ0cl9wYWdlX2luc2VydF9maXRzKGN1cnNvciwgTlVMTCwKIAkJCQkJCU5V
TEwsIHR1cGxlLCBuX2V4dCwgaGVhcCk7Cgo=

--===============1421567172==
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 13:01:19 +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


--===============1421567172==--