From: marko.makela
Date: January 25 2011 9:54am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3690) Bug#59464
List-Archive: http://lists.mysql.com/commits/129526
X-Bug: 59464
Message-Id: <201101250955.p0P8XrGR026579@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0044443196=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjEtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTA3NTYxOC0yeTJk
bmNuYm04eW56ank3CgogMzY5MCBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTI1CiAgICAgIEJ1ZyM1
OTQ2NCBSYWNlIGNvbmRpdGlvbiBpbiByb3dfdmVyc19idWlsZF9mb3Jfc2VtaV9jb25zaXN0ZW50
X3JlYWQKICAgICAgCiAgICAgIHJvd192ZXJzX2J1aWxkX2Zvcl9zZW1pX2NvbnNpc3RlbnRfcmVh
ZCgpOiBEZXJlZmVyZW5jZSB2ZXJzaW9uX3RyeCBiZWZvcmUKICAgICAgcmVsZWFzaW5nIGtlcm5l
bF9tdXRleCwgYnV0IG5vdCB0aGVyZWFmdGVyLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdl
L2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFu
Z2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdmVycy5jCj09PSBtb2Rp
ZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jJwotLS0gYS9zdG9yYWdl
L2lubm9iYXNlL3Jvdy9yb3cwdmVycy5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIw
MTEwMTI1MDc1NjE4LTJ5MmRuY25ibTh5bnpqeTcKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9yb3cv
cm93MHZlcnMuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyNTA5NTQ1MC1j
bWU1eW5lem9pdnlncjh0CkBAIC01OTMsMTEgKzU5MywxNSBAQCByb3dfdmVyc19idWlsZF9mb3Jf
c2VtaV9jb25zaXN0ZW50X3JlYWQoCiAKIAkJbXV0ZXhfZW50ZXIoJmtlcm5lbF9tdXRleCk7CiAJ
CXZlcnNpb25fdHJ4ID0gdHJ4X2dldF9vbl9pZCh2ZXJzaW9uX3RyeF9pZCk7CisJCWlmICh2ZXJz
aW9uX3RyeAorCQkgICAgJiYgKHZlcnNpb25fdHJ4LT5jb25jX3N0YXRlID09IFRSWF9DT01NSVRU
RURfSU5fTUVNT1JZCisJCQl8fCB2ZXJzaW9uX3RyeC0+Y29uY19zdGF0ZSA9PSBUUlhfTk9UX1NU
QVJURUQpKSB7CisKKwkJCXZlcnNpb25fdHJ4ID0gTlVMTDsKKwkJfQogCQltdXRleF9leGl0KCZr
ZXJuZWxfbXV0ZXgpOwogCi0JCWlmICghdmVyc2lvbl90cngKLQkJICAgIHx8IHZlcnNpb25fdHJ4
LT5jb25jX3N0YXRlID09IFRSWF9OT1RfU1RBUlRFRAotCQkgICAgfHwgdmVyc2lvbl90cngtPmNv
bmNfc3RhdGUgPT0gVFJYX0NPTU1JVFRFRF9JTl9NRU1PUlkpIHsKKwkJaWYgKCF2ZXJzaW9uX3Ry
eCkgewogCiAJCQkvKiBXZSBmb3VuZCBhIHZlcnNpb24gdGhhdCBiZWxvbmdzIHRvIGEKIAkJCWNv
bW1pdHRlZCB0cmFuc2FjdGlvbjogcmV0dXJuIGl0LiAqLwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0
b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0tLSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdp
bi9DaGFuZ2VMb2cJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjUwNzU2MTgt
MnkyZG5jbmJtOHluemp5NworKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCXJl
dmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTI1MDk1NDUwLWNtZTV5bmV6b2l2eWdy
OHQKQEAgLTEsNSArMSwxMCBAQAogMjAxMS0wMS0yNQlUaGUgSW5ub0RCIFRlYW0KIAorCSogcm93
L3JvdzB2ZXJzLmM6CisJRml4IEJ1ZyM1OTQ2NCBSYWNlIGNvbmRpdGlvbiBpbiByb3dfdmVyc19i
dWlsZF9mb3Jfc2VtaV9jb25zaXN0ZW50X3JlYWQKKworMjAxMS0wMS0yNQlUaGUgSW5ub0RCIFRl
YW0KKwogCSogYnRyL2J0cjBidHIuYywgYnRyL2J0cjBjdXIuYywgYnRyL2J0cjBzZWEuYywKIAli
dWYvYnVmMGJ1ZGR5LmMsIGJ1Zi9idWYwYnVmLmMsIGJ1Zi9idWYwbHJ1LmMsCiAJaW5jbHVkZS9i
dWYwYnVmLmgsIGluY2x1ZGUvYnVmMGJ1Zi5pYywgaW5jbHVkZS9idWYwbHJ1LmgsCgo9PT0gbW9k
aWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwdmVycy5jJwotLS0gYS9z
dG9yYWdlL2lubm9kYl9wbHVnaW4vcm93L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9y
YWNsZS5jb20tMjAxMTAxMjUwNzU2MTgtMnkyZG5jbmJtOHluemp5NworKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vcm93L3JvdzB2ZXJzLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20t
MjAxMTAxMjUwOTU0NTAtY21lNXluZXpvaXZ5Z3I4dApAQCAtNjY5LDExICs2NjksMTUgQEAgcm93
X3ZlcnNfYnVpbGRfZm9yX3NlbWlfY29uc2lzdGVudF9yZWFkKAogCiAJCW11dGV4X2VudGVyKCZr
ZXJuZWxfbXV0ZXgpOwogCQl2ZXJzaW9uX3RyeCA9IHRyeF9nZXRfb25faWQodmVyc2lvbl90cnhf
aWQpOworCQlpZiAodmVyc2lvbl90cngKKwkJICAgICYmICh2ZXJzaW9uX3RyeC0+Y29uY19zdGF0
ZSA9PSBUUlhfQ09NTUlUVEVEX0lOX01FTU9SWQorCQkJfHwgdmVyc2lvbl90cngtPmNvbmNfc3Rh
dGUgPT0gVFJYX05PVF9TVEFSVEVEKSkgeworCisJCQl2ZXJzaW9uX3RyeCA9IE5VTEw7CisJCX0K
IAkJbXV0ZXhfZXhpdCgma2VybmVsX211dGV4KTsKIAotCQlpZiAoIXZlcnNpb25fdHJ4Ci0JCSAg
ICB8fCB2ZXJzaW9uX3RyeC0+Y29uY19zdGF0ZSA9PSBUUlhfTk9UX1NUQVJURUQKLQkJICAgIHx8
IHZlcnNpb25fdHJ4LT5jb25jX3N0YXRlID09IFRSWF9DT01NSVRURURfSU5fTUVNT1JZKSB7CisJ
CWlmICghdmVyc2lvbl90cngpIHsKIAogCQkJLyogV2UgZm91bmQgYSB2ZXJzaW9uIHRoYXQgYmVs
b25ncyB0byBhCiAJCQljb21taXR0ZWQgdHJhbnNhY3Rpb246IHJldHVybiBpdC4gKi8KCg==

--===============0044443196==
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: 747c16d8fbfed1c2f4e769f03936642044a8f388
# timestamp: 2011-01-25 11:54:58 +0200
# base_revision_id: marko.makela@stripped\
#   2y2dncnbm8ynzjy7
# 
# Begin bundle
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
1/4u5IpwoSAaf/2m


--===============0044443196==--