From: marko.makela
Date: January 20 2011 9:48am
Subject: bzr commit into mysql-trunk-innodb branch (marko.makela:3444)
List-Archive: http://lists.mysql.com/commits/129254
Message-Id: <201101200948.p0K8o1oE023544@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1261645106=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjYtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA4MDgyMS1wZjNu
bTc1aTFndWZ0dWd0CgogMzQ0NCBNYXJrbyBNw6RrZWzDpAkyMDExLTAxLTIwCiAgICAgIE5vbi1m
dW5jdGlvbmFsIGNoYW5nZTogUmVtb3ZlIGEgZ290by4KCiAgICBtb2RpZmllZDoKICAgICAgc3Rv
cmFnZS9pbm5vYmFzZS90cngvdHJ4MHRyeC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lu
bm9iYXNlL3RyeC90cngwdHJ4LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cngu
YwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA4MDgyMS1wZjNubTc1aTFn
dWZ0dWd0CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvdHJ4L3RyeDB0cnguYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDEyMDA5NDc1NS0ybmxwbHd1bDQzcGJ5d3N5CkBAIC0xMDY2
LDIzICsxMDY2LDE3IEBAIHRyeF9jb21taXRfZm9yX215c3FsKAogCQkvKiBmYWxsIHRocm91Z2gg
Ki8KIAljYXNlIFRSWF9TVEFURV9BQ1RJVkU6CiAJY2FzZSBUUlhfU1RBVEVfUFJFUEFSRUQ6Ci0J
CWdvdG8gc3RhdGVfb2s7CisJCXRyeC0+b3BfaW5mbyA9ICJjb21taXR0aW5nIjsKKwkJdHJ4X2Nv
bW1pdCh0cngpOworCQlNT05JVE9SX0lOQyhNT05JVE9SX1RSWF9DT01NSVQpOworCQlNT05JVE9S
X0RFQyhNT05JVE9SX1RSWF9BQ1RJVkUpOworCQl0cngtPm9wX2luZm8gPSAiIjsKKwkJcmV0dXJu
KERCX1NVQ0NFU1MpOwogCWNhc2UgVFJYX1NUQVRFX0NPTU1JVFRFRF9JTl9NRU1PUlk6CiAJCWJy
ZWFrOwogCX0KIAl1dF9lcnJvcjsKLXN0YXRlX29rOgotCXRyeC0+b3BfaW5mbyA9ICJjb21taXR0
aW5nIjsKLQotCXRyeF9jb21taXQodHJ4KTsKLQotCU1PTklUT1JfSU5DKE1PTklUT1JfVFJYX0NP
TU1JVCk7Ci0KLQlNT05JVE9SX0RFQyhNT05JVE9SX1RSWF9BQ1RJVkUpOwotCi0JdHJ4LT5vcF9p
bmZvID0gIiI7Ci0KLQlyZXR1cm4oREJfU1VDQ0VTUyk7CisJcmV0dXJuKERCX0NPUlJVUFRJT04p
OwogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKi8vKioKCg==

--===============1261645106==
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: 81aa2ac5deaebd1eb4adee8d8f66c337663cb130
# timestamp: 2011-01-20 11:48:05 +0200
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/
# base_revision_id: marko.makela@stripped\
#   pf3nm75i1guftugt
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcfJ4s4AAaBflAAwUmP//38j
30C/79/wBAAIAFADmnmHLqDjbahJJU/QJo0j00yKP1PRGU9Rso02p5lJmj1NRkDSKB5qnqeo9NI0
AAAAAAAASSJiGk9FMPUak9EAHqD1Gnoho00AHMJgEwAmEwmmAAATJpoGElJiGpoxGjRMI9TMkAAA
AAMJhmDYHM2jLc8bt/fwaRI2Y7cEFcHvaVj3eAtynVmZefir3wsV43E0L4HnxOrLuTcqbv3PeyKq
D3mjx2VIj9IHvWJRmY3EGeu6Hvu4eivEaReq0KMwKYw9t9IUVSkFqSLAT8c0TmiwDIM5xGliRpTk
hvRfKMKeFARBFEK4iYMUT9+truZVKcU6LHiLXI3rS3bMIgPsehPoWvuK0MVHkW/i+zkurLhgXsss
ybgeIzqIjuBvG2cbuaLzdWNXQU1GjBL4t1I3dOQsAu6Bxko7JImc4RSrdYqNpYrHGzMVmtpiraqG
uJpUhz8xUrA6bSBAUZ4BvygTV1qKWK1g056NsKwcasZqITIULc4nukk2nOJhoeCeGFdAMQiUprSp
BQexM0yiIwBBPJCTgWtJnIQxLQ6UmElCXEEkwEh1BAatgcoYXjrn3owpjfNo3oi8k5NJoFoStbBc
TNmY4mpeiWg6dbnR6M+YxrKke0WJkxcbjb698R43Dr8EkOFEG/lKDnd3aTOHPZ3MD5vkDrQyj3vH
Bb8tVL++9wPIXPY9ja4Zi3sp08Rwc/KA6dXQGw8Niebe7Qx+Uj4mtSMe/f1PDckZOLUPybpUaoxL
PwDfioOAy4lR9pRW+CGMCz2yqRdarlD+1ZtNLmSMSRs6rYrJ+uR66FM7I9T1HJ1qbHpWYih99SF2
xXuPkWFg/X2U0Rs7BCGqj6V0SSOmq9cNLHNi8Fu7ipMteWbRXXmIhQJ0SsykQOJ8irykMp92W5kw
2XAzY68xgPeEA1GMGSwCo0BnrL+C5MjrMSiKNATSDpO+qeOkI9AZ03XVSmVpH1OFQJuMMooBBqSz
QSGEc8kwpNIpdohwM1pGIPY4RkWzJaH0NSuU4QIRICzhjALGB+6xcBcQhlNDmTKtV/NkiDFUJecS
Nb9g3NIkDAs7lPtpHGWlmU4nDsgaBQrky1qRJbWo9B+7gJLIwUqgUumje4AYm8T7yjS2g0V5okEf
0WEt7m5E6pzX5GuWOeBHosvCYHr9XBlONNLmzSLCagxmSoKQyCeSqhxTeUA9wtYpIT1IcwzM28Wy
hD/Euz/i7kinChIY+TxZwA==


--===============1261645106==--