From: marko.makela
Date: April 22 2010 9:34am
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3413 to 3414)
List-Archive: http://lists.mysql.com/commits/106341
Message-Id: <201004220934.o3M9GqQJ018586@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1344472007=="

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

IDM0MTQgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yMgogICAgICBDb3JyZWN0IHRoZSBkZWZpbml0
aW9uIG9mIERJQ1RfU1lTX0lOREVYRVNfTkFNRV9GSUVMRC4KICAgICAgV2hlbiByb3dfbWVyZ2Vf
ZHJvcF90ZW1wX2luZGV4ZXMoKSB3YXMgcmV3b3JrZWQgdG8gZHJvcCB0aGUgaW5kZXhlcwogICAg
ICB2aWEgdGhlIGRhdGEgZGljdGlvbmFyeSBjYWNoZSwgdGhlIGNvZGUgd2FzIGJyb2tlbiBiZWNh
dXNlIGl0IHdvdWxkCiAgICAgIHJlYWQgdGhlIGluZGV4IG5hbWUgZnJvbSB0aGUgd3JvbmcgZmll
bGQuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cK
ICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBib290LmMKICAgICAgc3RvcmFn
ZS9pbm5vZGJfcGx1Z2luL2luY2x1ZGUvZGljdDBib290LmgKIDM0MTMgTWFya28gTcOka2Vsw6QJ
MjAxMC0wNC0yMQogICAgICBidHJfcGFnZV9zcGxpdF9hbmRfaW5zZXJ0KCk6IEF2b2lkIGFuIGlu
ZmluaXRlIGxvb3AuIChCdWcgIzUyOTY0KQogICAgICAKICAgICAgYnRyX3BhZ2VfdHVwbGVfc21h
bGxlcigpOiBOZXcgZnVuY3Rpb24sIHJlZmFjdG9yZWQgZnJvbQogICAgICBidHJfcGFnZV9zcGxp
dF9hbmRfaW5zZXJ0KCkuCiAgICAgIAogICAgICBidHJfcGFnZV9nZXRfc3BsaXRfcmVjKCk6IFJl
bmFtZWQgZnJvbSBidHJfcGFnZV9nZXRfc3VyZV9zcGxpdF9yZWMoKS4KICAgICAgTm90ZSB0aGF0
IGEgTlVMTCByZXR1cm4gbWF5IG1lYW4gdGhhdCB0aGUgdHVwbGUgaXMgdG8gYmUgaW5zZXJ0ZWQg
aW50bwogICAgICBlaXRoZXIgdGhlIGxvd2VyIG9yIHVwcGVyIHBhZ2UsIHRvIGJlIGRldGVybWlu
ZWQgYnkgYnRyX3BhZ2VfdHVwbGVfc21hbGxlcigpLgogICAgICAKICAgICAgYnRyX3BhZ2Vfc3Bs
aXRfYW5kX2luc2VydCgpOiBXaGVuIGJ0cl9wYWdlX2dldF9zcGxpdF9yZWMoKSByZXR1cm5zIE5V
TEwsCiAgICAgIGludm9rZSBidHJfcGFnZV90dXBsZV9zbWFsbGVyKCkgdG8gZGV0ZXJtaW5lIHdo
aWNoIGhhbGYtcGFnZSB0aGUgdHVwbGUKICAgICAgYmVsb25ncyB0by4KICAgICAgCiAgICAgIFJl
dmlld2VkIGJ5IFN1bm55IEJhaW5zCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2J0ci9idHIwYnRy
LmMKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cnCi0t
LSBhL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMC0wNC0yMSAxODo1Mzo1OSAr
MDAwMAorKysgYi9zdG9yYWdlL2lubm9kYl9wbHVnaW4vQ2hhbmdlTG9nCTIwMTAtMDQtMjIgMDk6
MzM6NDIgKzAwMDAKQEAgLTEsMyArMSw5IEBACisyMDEwLTA0LTIyCVRoZSBJbm5vREIgVGVhbQor
CisJKiBpbmNsdWRlL2RpY3QwYm9vdC5oLCBkaWN0L2RpY3QwYm9vdC5jOgorCUZpeCBhIGJ1ZyB0
aGF0IHByZXZlbnRlZCB0aGUgY3Jhc2ggcmVjb3Zlcnkgb2YgZmFzdCBDUkVBVEUgSU5ERVgKKwlm
cm9tIGRyb3BwaW5nIHBhcnRpYWxseSBjcmVhdGVkIGluZGV4ZXMuCisKIDIwMTAtMDQtMjEJVGhl
IElubm9EQiBUZWFtCiAKIAkqIGJ0ci9idHIwYnRyLmM6Cgo9PT0gbW9kaWZpZWQgZmlsZSAnc3Rv
cmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBib290LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Ri
X3BsdWdpbi9kaWN0L2RpY3QwYm9vdC5jCTIwMTAtMDItMjAgMTY6NDU6NDEgKzAwMDAKKysrIGIv
c3RvcmFnZS9pbm5vZGJfcGx1Z2luL2RpY3QvZGljdDBib290LmMJMjAxMC0wNC0yMiAwOTozMzo0
MiArMDAwMApAQCAtMzY4LDggKzM2OCw4IEBAIGRpY3RfYm9vdCh2b2lkKQogI2lmIERJQ1RfU1lT
X0lOREVYRVNfVFlQRV9GSUVMRCAhPSA0ICsgMgogI2Vycm9yICJESUNUX1NZU19JTkRFWEVTX1RZ
UEVfRklFTEQgIT0gNCArIDIiCiAjZW5kaWYKLSNpZiBESUNUX1NZU19JTkRFWEVTX05BTUVfRklF
TEQgIT0gMSArIDIKLSNlcnJvciAiRElDVF9TWVNfSU5ERVhFU19OQU1FX0ZJRUxEICE9IDEgKyAy
IgorI2lmIERJQ1RfU1lTX0lOREVYRVNfTkFNRV9GSUVMRCAhPSAyICsgMgorI2Vycm9yICJESUNU
X1NZU19JTkRFWEVTX05BTUVfRklFTEQgIT0gMiArIDIiCiAjZW5kaWYKIAogCXRhYmxlLT5pZCA9
IERJQ1RfSU5ERVhFU19JRDsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVn
aW4vaW5jbHVkZS9kaWN0MGJvb3QuaCcKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2luY2x1
ZGUvZGljdDBib290LmgJMjAxMC0wMi0yMCAxNjo0NTo0MSArMDAwMAorKysgYi9zdG9yYWdlL2lu
bm9kYl9wbHVnaW4vaW5jbHVkZS9kaWN0MGJvb3QuaAkyMDEwLTA0LTIyIDA5OjMzOjQyICswMDAw
CkBAIC0xMzcsNyArMTM3LDcgQEAgY2x1c3RlcmVkIGluZGV4ICovCiAjZGVmaW5lIERJQ1RfU1lT
X0lOREVYRVNfUEFHRV9OT19GSUVMRAkgOAogI2RlZmluZSBESUNUX1NZU19JTkRFWEVTX1NQQUNF
X05PX0ZJRUxECSA3CiAjZGVmaW5lIERJQ1RfU1lTX0lOREVYRVNfVFlQRV9GSUVMRAkgNgotI2Rl
ZmluZSBESUNUX1NZU19JTkRFWEVTX05BTUVfRklFTEQJIDMKKyNkZWZpbmUgRElDVF9TWVNfSU5E
RVhFU19OQU1FX0ZJRUxECSA0CiAKIC8qIFdoZW4gYSByb3cgaWQgd2hpY2ggaXMgemVybyBtb2R1
bG8gdGhpcyBudW1iZXIgKHdoaWNoIG11c3QgYmUgYSBwb3dlciBvZgogdHdvKSBpcyBhc3NpZ25l
ZCwgdGhlIGZpZWxkIERJQ1RfSERSX1JPV19JRCBvbiB0aGUgZGljdGlvbmFyeSBoZWFkZXIgcGFn
ZSBpcwoK

--===============1344472007==
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: 863d80c51b95920707659476f95164c9f7ec2017
# timestamp: 2010-04-22 12:34:33 +0300
# base_revision_id: marko.makela@stripped\
#   8qaxoa2yyrpzwdd7
# 
# Begin bundle
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


--===============1344472007==--