From: marko.makela
Date: May 19 2010 8:01am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3471) Bug#53307
List-Archive: http://lists.mysql.com/commits/108576
X-Bug: 53307
Message-Id: <201005190802.o4J6L11B012742@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2136328293=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS4xLWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkwNzU4NDMtNGdsM3Vp
am82Y3dqdGNmOQoKIDM0NzEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xOQogICAgICBTaWxlbmNl
IHNvbWUgbW9yZSBib2d1cyBWYWxncmluZCB3YXJuaW5ncyBvbiBub24tMzItYml0IHN5c3RlbXMu
IChCdWcgIzUzMzA3KQoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnVmL2J1ZjBidWRkeS5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5j
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGxydS5jCiAgICAgIHN0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9wYWdlL3BhZ2UwemlwLmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2Uv
aW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1ZGR5LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9idWYvYnVmMGJ1ZGR5LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTkw
NzU4NDMtNGdsM3Vpam82Y3dqdGNmOQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1
ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5MDgwMTUyLWgz
NTU1b3FtdTN3bzk1c28KQEAgLTQ5NSw3ICs0OTUsMTIgQEAgc3VjY2VzczoKIAkJbXV0ZXhfZXhp
dChtdXRleCk7CiAJfSBlbHNlIGlmIChpID09IGJ1Zl9idWRkeV9nZXRfc2xvdChzaXplb2YoYnVm
X3BhZ2VfdCkpKSB7CiAJCS8qIFRoaXMgbXVzdCBiZSBhIGJ1Zl9wYWdlX3Qgb2JqZWN0LiAqLwor
I2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkJLyogT24gMzItYml0IHN5c3RlbXMsIHRoZXJlIGlz
IG5vIHBhZGRpbmcgaW4KKwkJYnVmX3BhZ2VfdC4gIE9uIG90aGVyIHN5c3RlbXMsIFZhbGdyaW5k
IGNvdWxkIGNvbXBsYWluCisJCWFib3V0IHVuaW5pdGlhbGl6ZWQgcGFkIGJ5dGVzLiAqLwogCQlV
TklWX01FTV9BU1NFUlRfUlcoc3JjLCBzaXplKTsKKyNlbmRpZgogCQlpZiAoYnVmX2J1ZGR5X3Jl
bG9jYXRlX2Jsb2NrKHNyYywgZHN0KSkgewogCiAJCQlnb3RvIHN1Y2Nlc3M7Cgo9PT0gbW9kaWZp
ZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J1Zi9idWYwYnVmLmMnCi0tLSBhL3N0b3Jh
Z2UvaW5ub2RiX3BsdWdpbi9idWYvYnVmMGJ1Zi5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tLTIwMTAwNTE5MDc1ODQzLTRnbDN1aWpvNmN3anRjZjkKKysrIGIvc3RvcmFnZS9pbm5vZGJf
cGx1Z2luL2J1Zi9idWYwYnVmLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1
MTkwODAxNTItaDM1NTVvcW11M3dvOTVzbwpAQCAtMjI4MCw3ICsyMjgwLDEyIEBAIHdhaXRfdW50
aWxfdW5maXhlZDoKIAl1dF9hZChidWZfYmxvY2tfZ2V0X3N0YXRlKGJsb2NrKSA9PSBCVUZfQkxP
Q0tfRklMRV9QQUdFKTsKIAogCW11dGV4X2VudGVyKCZibG9jay0+bXV0ZXgpOworI2lmIFVOSVZf
V09SRF9TSVpFID09IDQKKwkvKiBPbiAzMi1iaXQgc3lzdGVtcywgdGhlcmUgaXMgbm8gcGFkZGlu
ZyBpbiBidWZfcGFnZV90LiAgT24KKwlvdGhlciBzeXN0ZW1zLCBWYWxncmluZCBjb3VsZCBjb21w
bGFpbiBhYm91dCB1bmluaXRpYWxpemVkIHBhZAorCWJ5dGVzLiAqLwogCVVOSVZfTUVNX0FTU0VS
VF9SVygmYmxvY2stPnBhZ2UsIHNpemVvZiBibG9jay0+cGFnZSk7CisjZW5kaWYKIAogCWJ1Zl9i
bG9ja19idWZfZml4X2luYyhibG9jaywgZmlsZSwgbGluZSk7CiAKCj09PSBtb2RpZmllZCBmaWxl
ICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vYnVmL2J1ZjBscnUuYycKLS0tIGEvc3RvcmFnZS9pbm5v
ZGJfcGx1Z2luL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDA1MTkwNzU4NDMtNGdsM3Vpam82Y3dqdGNmOQorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4v
YnVmL2J1ZjBscnUuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA4MDE1
Mi1oMzU1NW9xbXUzd285NXNvCkBAIC0xNDk0LDggKzE0OTQsMTMgQEAgYWxsb2M6CiAKIAkJCQl1
dF9hZChwcmV2X2ItPmluX0xSVV9saXN0KTsKIAkJCQl1dF9hZChidWZfcGFnZV9pbl9maWxlKHBy
ZXZfYikpOworI2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkJCQkvKiBPbiAzMi1iaXQgc3lzdGVt
cywgdGhlcmUgaXMgbm8KKwkJCQlwYWRkaW5nIGluIGJ1Zl9wYWdlX3QuICBPbiBvdGhlcgorCQkJ
CXN5c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluIGFib3V0CisJCQkJdW5pbml0aWFsaXpl
ZCBwYWQgYnl0ZXMuICovCiAJCQkJVU5JVl9NRU1fQVNTRVJUX1JXKHByZXZfYiwgc2l6ZW9mICpw
cmV2X2IpOwotCisjZW5kaWYKIAkJCQlVVF9MSVNUX0lOU0VSVF9BRlRFUihMUlUsIGJ1Zl9wb29s
LT5MUlUsCiAJCQkJCQkgICAgIHByZXZfYiwgYik7CiAKCj09PSBtb2RpZmllZCBmaWxlICdzdG9y
YWdlL2lubm9kYl9wbHVnaW4vcGFnZS9wYWdlMHppcC5jJwotLS0gYS9zdG9yYWdlL2lubm9kYl9w
bHVnaW4vcGFnZS9wYWdlMHppcC5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTE5MDc1ODQzLTRnbDN1aWpvNmN3anRjZjkKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Bh
Z2UvcGFnZTB6aXAuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA4MDE1
Mi1oMzU1NW9xbXUzd285NXNvCkBAIC0zMTE3LDggKzMxMTcsMTMgQEAgcGFnZV96aXBfdmFsaWRh
dGVfbG93KAogCXRlbXBfcGFnZV96aXAgaW4gYSBkZWJ1Z2dlciB3aGVuIHJ1bm5pbmcgdmFsZ3Jp
bmQgLS1kYi1hdHRhY2guICovCiAJVkFMR1JJTkRfR0VUX1ZCSVRTKHBhZ2UsIHRlbXBfcGFnZSwg
VU5JVl9QQUdFX1NJWkUpOwogCVVOSVZfTUVNX0FTU0VSVF9SVyhwYWdlLCBVTklWX1BBR0VfU0la
RSk7CisjIGlmIFVOSVZfV09SRF9TSVpFID09IDQKIAlWQUxHUklORF9HRVRfVkJJVFMocGFnZV96
aXAsICZ0ZW1wX3BhZ2VfemlwLCBzaXplb2YgdGVtcF9wYWdlX3ppcCk7CisJLyogT24gMzItYml0
IHN5c3RlbXMsIHRoZXJlIGlzIG5vIHBhZGRpbmcgaW4gcGFnZV96aXBfZGVzX3QuCisJT24gb3Ro
ZXIgc3lzdGVtcywgVmFsZ3JpbmQgY291bGQgY29tcGxhaW4gYWJvdXQgdW5pbml0aWFsaXplZAor
CXBhZCBieXRlcy4gKi8KIAlVTklWX01FTV9BU1NFUlRfUlcocGFnZV96aXAsIHNpemVvZiAqcGFn
ZV96aXApOworIyBlbmRpZgogCVZBTEdSSU5EX0dFVF9WQklUUyhwYWdlX3ppcC0+ZGF0YSwgdGVt
cF9wYWdlLAogCQkJICAgcGFnZV96aXBfZ2V0X3NpemUocGFnZV96aXApKTsKIAlVTklWX01FTV9B
U1NFUlRfUlcocGFnZV96aXAtPmRhdGEsIHBhZ2VfemlwX2dldF9zaXplKHBhZ2VfemlwKSk7Cgo=

--===============2136328293==
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: befda87d4ca32c0900af6ea66bfed9da043d873d
# timestamp: 2010-05-19 11:02:01 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   4gl3uijo6cwjtcf9
# 
# Begin bundle
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
/8XckU4UJBaRWP+A


--===============2136328293==--