From: marko.makela
Date: May 19 2010 9:36am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3105)
List-Archive: http://lists.mysql.com/commits/108596
Message-Id: <201005190936.o4J95rZ9020528@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0000240029=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwvNS41LWlubm9kYi8gYmFz
ZWQgb24gcmV2aWQ6aW5hYW0ucmFuYUBvcmFjbGUuY29tLTIwMTAwNTE4MTY1MzAyLW92ZjVmcW42
YTB1MjEycmMKCiAzMTA1IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTkKICAgICAgTWVyZ2UgYSBj
aGFuZ2UgZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAKICAgICAgLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5v
OiAzNDcxCiAgICAgIHJldmlzaW9uLWlkOiBtYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUx
OTA4MDE1Mi1oMzU1NW9xbXUzd285NXNvCiAgICAgIHBhcmVudDogbWFya28ubWFrZWxhQG9yYWNs
ZS5jb20tMjAxMDA1MTkwNzU4NDMtNGdsM3Vpam82Y3dqdGNmOQogICAgICBjb21taXR0ZXI6IE1h
cmtvIE3DpGtlbMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgYnJhbmNoIG5pY2s6
IDUuMS1pbm5vZGIKICAgICAgdGltZXN0YW1wOiBXZWQgMjAxMC0wNS0xOSAxMTowMTo1MiArMDMw
MAogICAgICBtZXNzYWdlOgogICAgICAgIFNpbGVuY2Ugc29tZSBtb3JlIGJvZ3VzIFZhbGdyaW5k
IHdhcm5pbmdzIG9uIG5vbi0zMi1iaXQgc3lzdGVtcy4gKEJ1ZyAjNTMzMDcpCgogICAgbW9kaWZp
ZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWRkeS5jCiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBscnUuYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTB6
aXAuYwo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGJ1ZGR5LmMn
Ci0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvYnVmL2J1ZjBidWRkeS5jCXJldmlkOmluYWFtLnJhbmFA
b3JhY2xlLmNvbS0yMDEwMDUxODE2NTMwMi1vdmY1ZnFuNmEwdTIxMnJjCisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvYnVmL2J1ZjBidWRkeS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTAwNTE5MDkzNjI3LW5hc2ZtMWJvODM3bHlya20KQEAgLTUwMiw3ICs1MDIsMTIgQEAgc3VjY2Vz
czoKIAkJbXV0ZXhfZXhpdChtdXRleCk7CiAJfSBlbHNlIGlmIChpID09IGJ1Zl9idWRkeV9nZXRf
c2xvdChzaXplb2YoYnVmX3BhZ2VfdCkpKSB7CiAJCS8qIFRoaXMgbXVzdCBiZSBhIGJ1Zl9wYWdl
X3Qgb2JqZWN0LiAqLworI2lmIFVOSVZfV09SRF9TSVpFID09IDQKKwkJLyogT24gMzItYml0IHN5
c3RlbXMsIHRoZXJlIGlzIG5vIHBhZGRpbmcgaW4KKwkJYnVmX3BhZ2VfdC4gIE9uIG90aGVyIHN5
c3RlbXMsIFZhbGdyaW5kIGNvdWxkIGNvbXBsYWluCisJCWFib3V0IHVuaW5pdGlhbGl6ZWQgcGFk
IGJ5dGVzLiAqLwogCQlVTklWX01FTV9BU1NFUlRfUlcoc3JjLCBzaXplKTsKKyNlbmRpZgogCQlp
ZiAoYnVmX2J1ZGR5X3JlbG9jYXRlX2Jsb2NrKHNyYywgZHN0KSkgewogCiAJCQlnb3RvIHN1Y2Nl
c3M7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9idWYvYnVmMGxydS5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2J1Zi9idWYwbHJ1LmMJcmV2aWQ6aW5hYW0ucmFuYUBvcmFj
bGUuY29tLTIwMTAwNTE4MTY1MzAyLW92ZjVmcW42YTB1MjEycmMKKysrIGIvc3RvcmFnZS9pbm5v
YmFzZS9idWYvYnVmMGxydS5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTE5
MDkzNjI3LW5hc2ZtMWJvODM3bHlya20KQEAgLTE1NzgsOCArMTU3OCwxMyBAQCBhbGxvYzoKIAog
CQkJCXV0X2FkKHByZXZfYi0+aW5fTFJVX2xpc3QpOwogCQkJCXV0X2FkKGJ1Zl9wYWdlX2luX2Zp
bGUocHJldl9iKSk7CisjaWYgVU5JVl9XT1JEX1NJWkUgPT0gNAorCQkJCS8qIE9uIDMyLWJpdCBz
eXN0ZW1zLCB0aGVyZSBpcyBubworCQkJCXBhZGRpbmcgaW4gYnVmX3BhZ2VfdC4gIE9uIG90aGVy
CisJCQkJc3lzdGVtcywgVmFsZ3JpbmQgY291bGQgY29tcGxhaW4gYWJvdXQKKwkJCQl1bmluaXRp
YWxpemVkIHBhZCBieXRlcy4gKi8KIAkJCQlVTklWX01FTV9BU1NFUlRfUlcocHJldl9iLCBzaXpl
b2YgKnByZXZfYik7Ci0KKyNlbmRpZgogCQkJCVVUX0xJU1RfSU5TRVJUX0FGVEVSKExSVSwgYnVm
X3Bvb2wtPkxSVSwKIAkJCQkJCSAgICAgcHJldl9iLCBiKTsKIAoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvcGFnZS9wYWdlMHppcC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNl
L3BhZ2UvcGFnZTB6aXAuYwlyZXZpZDppbmFhbS5yYW5hQG9yYWNsZS5jb20tMjAxMDA1MTgxNjUz
MDItb3ZmNWZxbjZhMHUyMTJyYworKysgYi9zdG9yYWdlL2lubm9iYXNlL3BhZ2UvcGFnZTB6aXAu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxOTA5MzYyNy1uYXNmbTFibzgz
N2x5cmttCkBAIC0zMTE3LDggKzMxMTcsMTMgQEAgcGFnZV96aXBfdmFsaWRhdGVfbG93KAogCXRl
bXBfcGFnZV96aXAgaW4gYSBkZWJ1Z2dlciB3aGVuIHJ1bm5pbmcgdmFsZ3JpbmQgLS1kYi1hdHRh
Y2guICovCiAJVkFMR1JJTkRfR0VUX1ZCSVRTKHBhZ2UsIHRlbXBfcGFnZSwgVU5JVl9QQUdFX1NJ
WkUpOwogCVVOSVZfTUVNX0FTU0VSVF9SVyhwYWdlLCBVTklWX1BBR0VfU0laRSk7CisjIGlmIFVO
SVZfV09SRF9TSVpFID09IDQKIAlWQUxHUklORF9HRVRfVkJJVFMocGFnZV96aXAsICZ0ZW1wX3Bh
Z2VfemlwLCBzaXplb2YgdGVtcF9wYWdlX3ppcCk7CisJLyogT24gMzItYml0IHN5c3RlbXMsIHRo
ZXJlIGlzIG5vIHBhZGRpbmcgaW4gcGFnZV96aXBfZGVzX3QuCisJT24gb3RoZXIgc3lzdGVtcywg
VmFsZ3JpbmQgY291bGQgY29tcGxhaW4gYWJvdXQgdW5pbml0aWFsaXplZAorCXBhZCBieXRlcy4g
Ki8KIAlVTklWX01FTV9BU1NFUlRfUlcocGFnZV96aXAsIHNpemVvZiAqcGFnZV96aXApOworIyBl
bmRpZgogCVZBTEdSSU5EX0dFVF9WQklUUyhwYWdlX3ppcC0+ZGF0YSwgdGVtcF9wYWdlLAogCQkJ
ICAgcGFnZV96aXBfZ2V0X3NpemUocGFnZV96aXApKTsKIAlVTklWX01FTV9BU1NFUlRfUlcocGFn
ZV96aXAtPmRhdGEsIHBhZ2VfemlwX2dldF9zaXplKHBhZ2VfemlwKSk7Cgo=

--===============0000240029==
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.5-innodb/
# testament_sha1: d6b6be566846eeeb3a86b1fcdd3b46df73c0da56
# timestamp: 2010-05-19 12:36:37 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: inaam.rana@stripped\
#   ovf5fqn6a0u212rc
# 
# Begin bundle
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
owl5d0B0vtu4P4u5IpwoSEbm5EAA


--===============0000240029==--