From: marko.makela
Date: January 20 2011 9:56am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3443 to 3445)
List-Archive: http://lists.mysql.com/commits/129261
Message-Id: <201101200957.p0K8jIn4010364@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1595254789=="

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

IDM0NDUgTWFya28gTcOka2Vsw6QJMjAxMS0wMS0yMAogICAgICBDbGFyaWZ5IHRoZSBwcm90ZWN0
aW9uIHJ1bGVzIG9mIHRyeF9sb2NrX3Q6OndhaXRfdGhyLgoKICAgIG1vZGlmaWVkOgogICAgICBz
dG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oCiAzNDQ0IE1hcmtvIE3DpGtlbMOkCTIw
MTEtMDEtMjAKICAgICAgTm9uLWZ1bmN0aW9uYWwgY2hhbmdlOiBSZW1vdmUgYSBnb3RvLgoKICAg
IG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL3RyeC90cngwdHJ4LmMKIDM0NDMgTWFy
a28gTcOka2Vsw6QJMjAxMS0wMS0yMAogICAgICBXTCM1NDU4IGNsZWFuLXVwOiBDbGFyaWZ5IHRo
ZSBsYXRjaGluZyBydWxlcyBmb3IgdHJ4LT5zdGF0ZSBjaGFuZ2VzLgogICAgICAKICAgICAgVGhp
cyBydWxlcyBpcyBhbHJlYWR5IGRvY3VtZW50ZWQgaW4gdHJ4MHRyeC5oIGFuZCBwb3NzaWJseSBz
b21lCiAgICAgIG90aGVyIHBsYWNlcyBpbiB0aGUgY29kZToKICAgICAgCiAgICAgIFdoZW4gYSB0
cmFuc2FjdGlvbiBpcyAob3IgbWF5IGJlKSBpbiB0aGUgdHJ4LT5teXNxbF90cnhfbGlzdCBvcgog
ICAgICB0cnhfc3lzLT50cnhfbGlzdCwgY2hhbmdpbmcgaXRzIHN0YXRlIHRvIG9yIGZyb20gVFJY
X1NUQVRFX05PVF9TVEFSVEVECiAgICAgIGlzIG9ubHkgYWxsb3dlZCB3aGlsZSBob2xkaW5nIHRy
eF9zeXMtPmxvY2sgaW4gZXhjbHVzaXZlIG1vZGUuCiAgICAgIAogICAgICB0cnhfc3RhcnRfbG93
KCk6IENoYW5nZSB0aGUgc3RhdGUgZnJvbSBUUlhfU1RBVEVfTk9UX1NUQVJURUQgdG8KICAgICAg
VFJYX1NUQVRFX0FDVElWRSB3aGlsZSBob2xkaW5nIHRyeF9zeXMtPmxvY2suCiAgICAgIAogICAg
ICB0cnhfY29tbWl0KCk6IENoYW5nZSB0aGUgc3RhdGUgdG8gVFJYX1NUQVRFX05PVF9TVEFSVEVE
IHdoaWxlIGhvbGRpbmcKICAgICAgdHJ4X3N5cy0+bG9jay4gUmVtb3ZlIHRoZSB0cmFuc2FjdGlv
biBmcm9tIHRyeF9zeXMtPnRyeF9saXN0IGJlZm9yZQogICAgICByZW1vdmluZyB0aGUgcmVhZCB2
aWV3IGFuZCBmbHVzaGluZyB0aGUgcmVkbyBsb2cuCiAgICAgIAogICAgICB0cnhfY2xlYW51cF9h
dF9kYl9zdGFydHVwKCk6IENoYW5nZSB0aGUgc3RhdGUgdG8gVFJYX1NUQVRFX05PVF9TVEFSVEVE
CiAgICAgIHdoaWxlIGhvbGRpbmcgdHJ4X3N5cy0+bG9jay4KICAgICAgCiAgICAgIGxvY2tfcHJp
bnRfaW5mb19hbGxfdHJhbnNhY3Rpb25zKCksIHJlYWRfdmlld19vcGVuX25vd19sb3coKTogVXBk
YXRlCiAgICAgIGNvbW1lbnRzIGFib3V0IHJlYWRzIG9mIHRyeC0+c3RhdGUgdGhhdCBhcmUgbm8g
bG9uZ2VyIGRpcnR5LgogICAgICAKICAgICAgcmI6Ly81NzMgYXBwcm92ZWQgYnkgU3VubnkgQmFp
bnMKCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5j
CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvcmVhZC9yZWFkMHJlYWQuYwogICAgICBzdG9yYWdlL2lu
bm9iYXNlL3RyeC90cngwdHJ4LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jhc2Uv
aW5jbHVkZS90cngwdHJ4LmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS90cngwdHJ4
LmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMTAxMjAwODA4MjEtcGYzbm03NWkx
Z3VmdHVndAorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvdHJ4MHRyeC5oCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTEwMTIwMDk1MDQ5LTR4dmppdnFjbGRnaGk3N2IKQEAg
LTQzMSw5ICs0MzEsMTMgQEAgc3RydWN0IHRyeF9sb2NrX3N0cnVjdCB7CiAJdGltZV90CQl3YWl0
X3N0YXJ0ZWQ7CS8qITwgbG9jayB3YWl0IHN0YXJ0ZWQgYXQgdGhpcyB0aW1lLAogCQkJCQlwcm90
ZWN0ZWQgb25seSBieSBsb2NrX3N5cy0+bXV0ZXggKi8KIAotCXF1ZV90aHJfdCoJd2FpdF90aHI7
CS8qITwgcXVlcnkgdGhyZWFkIGJlbG9naW5nIHRvIHRoaXMKKwlxdWVfdGhyX3QqCXdhaXRfdGhy
OwkvKiE8IHF1ZXJ5IHRocmVhZCBiZWxvbmdpbmcgdG8gdGhpcwogCQkJCQl0cnggdGhhdCBpcyBp
biBRVUVfVEhSX0xPQ0tfV0FJVAotCQkJCSAgICAgICAJc3RhdGUgKi8KKwkJCQkgICAgICAgCXN0
YXRlLiBGb3IgdGhyZWFkcyBzdXNwZW5kZWQgaW4gYQorCQkJCQlsb2NrIHdhaXQsIHRoaXMgaXMg
cHJvdGVjdGVkIGJ5CisJCQkJCWxvY2tfc3lzLT5tdXRleC4gT3RoZXJ3aXNlLCB0aGlzIG1heQor
CQkJCQlvbmx5IGJlIG1vZGlmaWVkIGJ5IHRoZSB0aHJlYWQgdGhhdCBpcworCQkJCQlzZXJ2aW5n
IHRoZSBydW5uaW5nIHRyYW5zYWN0aW9uLiAqLwogCiAJbWVtX2hlYXBfdCoJbG9ja19oZWFwOwkv
KiE8IG1lbW9yeSBoZWFwIGZvciB0cnhfbG9ja3M7CiAJCQkJCXByb3RlY3RlZCBieSBsb2NrX3N5
cy0+bXV0ZXggKi8KCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3RyeC90cngw
dHJ4LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA4MDgyMS1wZjNubTc1aTFndWZ0dWd0CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDEyMDA5NTA0OS00eHZqaXZxY2xkZ2hpNzdiCkBAIC0xMDY2LDIzICsxMDY2LDE3IEBA
IHRyeF9jb21taXRfZm9yX215c3FsKAogCQkvKiBmYWxsIHRocm91Z2ggKi8KIAljYXNlIFRSWF9T
VEFURV9BQ1RJVkU6CiAJY2FzZSBUUlhfU1RBVEVfUFJFUEFSRUQ6Ci0JCWdvdG8gc3RhdGVfb2s7
CisJCXRyeC0+b3BfaW5mbyA9ICJjb21taXR0aW5nIjsKKwkJdHJ4X2NvbW1pdCh0cngpOworCQlN
T05JVE9SX0lOQyhNT05JVE9SX1RSWF9DT01NSVQpOworCQlNT05JVE9SX0RFQyhNT05JVE9SX1RS
WF9BQ1RJVkUpOworCQl0cngtPm9wX2luZm8gPSAiIjsKKwkJcmV0dXJuKERCX1NVQ0NFU1MpOwog
CWNhc2UgVFJYX1NUQVRFX0NPTU1JVFRFRF9JTl9NRU1PUlk6CiAJCWJyZWFrOwogCX0KIAl1dF9l
cnJvcjsKLXN0YXRlX29rOgotCXRyeC0+b3BfaW5mbyA9ICJjb21taXR0aW5nIjsKLQotCXRyeF9j
b21taXQodHJ4KTsKLQotCU1PTklUT1JfSU5DKE1PTklUT1JfVFJYX0NPTU1JVCk7Ci0KLQlNT05J
VE9SX0RFQyhNT05JVE9SX1RSWF9BQ1RJVkUpOwotCi0JdHJ4LT5vcF9pbmZvID0gIiI7Ci0KLQly
ZXR1cm4oREJfU1VDQ0VTUyk7CisJcmV0dXJuKERCX0NPUlJVUFRJT04pOwogfQogCiAvKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKi8vKioKCg==

--===============1595254789==
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.6-innodb/
# testament_sha1: 917a26adadc673866ecb97cd8409086701857739
# timestamp: 2011-01-20 11:56:45 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   pf3nm75i1guftugt
# 
# Begin bundle
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
7kinChII73bqgA==


--===============1595254789==--