From: marko.makela
Date: May 12 2010 11:23am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3090 to 3091)
List-Archive: http://lists.mysql.com/commits/108117
Message-Id: <201005121123.o4CB0kWa028259@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1369339575=="

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

IDMwOTEgTWFya28gTcOka2Vsw6QJMjAxMC0wNS0xMgogICAgICBNZXJnZSBmcm9tIG15c3FsLTUu
MS1pbm5vZGI6CiAgICAgIAogICAgICAgIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICAgICAgIHJldm5vOiAzNDYyCiAgICAgICAg
cmV2aXNpb24taWQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0MjEyLWUyaDlu
MW9ieGpiOHRmZzQKICAgICAgICBwYXJlbnQ6IG1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAw
NTEyMDYwOTIyLW9oNzE2dWdwdWtmYWt3dmgKICAgICAgICBjb21taXR0ZXI6IE1hcmtvIE3DpGtl
bMOkIDxtYXJrby5tYWtlbGFAb3JhY2xlLmNvbT4KICAgICAgICBicmFuY2ggbmljazogbXlzcWwt
NS4xLWlubm9kYgogICAgICAgIHRpbWVzdGFtcDogV2VkIDIwMTAtMDUtMTIgMTM6NDI6MTIgKzAz
MDAKICAgICAgICBtZXNzYWdlOgogICAgICAgICAgaGFfaW5ub2Jhc2U6OmFkZF9pbmRleCgpOiBS
ZXNldCB0cngtPmVycm9yX3N0YXRlIGluIGVycm9yIGhhbmRsaW5nLgogICAgICAgICAgKEJ1ZyAj
NTM1OTEpCgogICAgYWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2Ri
X2J1ZzUzNTkxLnJlc3VsdAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9i
dWc1MzU5MS50ZXN0CiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVy
L2hhbmRsZXIwYWx0ZXIuY2MKIDMwOTAgVmFzaWwgRGltb3YJMjAxMC0wNS0xMgogICAgICBGaXgg
dGhlIGZhaWxpbmcgaW5ub2RiLmlubm9kYiB0ZXN0LgogICAgICAKICAgICAgU3VwcG9ydCByZXR1
cm5pbmcgNTEyIGFuZCA1MTEgcGFnZXMgZm9yIHRoZSBidWZmZXIgcG9vbCBzaXplLCB0aGlzCiAg
ICAgIGlzIHVuZGV0ZXJtaW5pc3RpYyBhbmQgcHJvYmFibHkgZGVwZW5kcyBvbiBhbGlnbm1lbnQg
aXNzdWVzLgogICAgICAKICAgICAgVGhlIGRlZmF1bHQgYnVmZmVyIHBvb2wgc2l6ZSBpcyA4TSAo
NTEyKSBwYWdlcywgd2hpY2ggaXMgc2V0IGluCiAgICAgIGluY2x1ZGUvZGVmYXVsdF9teXNxbGQu
Y25mLiBTbyB0aGUgcHJldmlvdXMgInJlcGxhY2VfcmVzdWx0IDgxOTIgODE5MSIKICAgICAgaGFk
IG5vIGVmZmVjdC4KCiAgICBtb2RpZmllZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIv
ci9pbm5vZGIucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiLnRl
c3QKPT09IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX2J1ZzUz
NTkxLnJlc3VsdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTM1
OTEucmVzdWx0CTE5NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGIvci9pbm5vZGJfYnVnNTM1OTEucmVzdWx0CXJldmlkOm1hcmtvLm1ha2VsYUBvcmFj
bGUuY29tLTIwMTAwNTEyMTExOTI2LWphejk0N3lmaXAxZXh4aXgKQEAgLTAsMCArMSwxNiBAQAor
U0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7CitTRVQgR0xPQkFMIGlu
bm9kYl9maWxlX3Blcl90YWJsZT1vbjsKK3NldCBvbGRfYWx0ZXJfdGFibGU9MDsKK0NSRUFURSBU
QUJMRSBidWc1MzU5MShhIHRleHQgY2hhcnNldCB1dGY4IG5vdCBudWxsKQorRU5HSU5FPUlubm9E
QiBLRVlfQkxPQ0tfU0laRT0xOworQUxURVIgVEFCTEUgYnVnNTM1OTEgQUREIFBSSU1BUlkgS0VZ
KGEoMjIwKSk7CitFUlJPUiBIWTAwMDogVG9vIGJpZyByb3cKK1NIT1cgV0FSTklOR1M7CitMZXZl
bAlDb2RlCU1lc3NhZ2UKK0Vycm9yCTEzOQlUb28gYmlnIHJvdworRXJyb3IJMTExOAlSb3cgc2l6
ZSB0b28gbGFyZ2UuIFRoZSBtYXhpbXVtIHJvdyBzaXplIGZvciB0aGUgdXNlZCB0YWJsZSB0eXBl
LCBub3QgY291bnRpbmcgQkxPQnMsIGlzIDgxMjYuIFlvdSBoYXZlIHRvIGNoYW5nZSBzb21lIGNv
bHVtbnMgdG8gVEVYVCBvciBCTE9CcworRXJyb3IJMTAzMAlHb3QgZXJyb3IgMTM5IGZyb20gc3Rv
cmFnZSBlbmdpbmUKK0RST1AgVEFCTEUgYnVnNTM1OTE7CitTRVQgR0xPQkFMIGlubm9kYl9maWxl
X2Zvcm1hdD1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0X2NoZWNrPUFu
dGVsb3BlOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9MDsKCj09PSBhZGRlZCBm
aWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1MzU5MS50ZXN0JwotLS0g
YS9teXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9idWc1MzU5MS50ZXN0CTE5NzAtMDEt
MDEgMDA6MDA6MDAgKzAwMDAKKysrIGIvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJf
YnVnNTM1OTEudGVzdAlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjExMTky
Ni1qYXo5NDd5ZmlwMWV4eGl4CkBAIC0wLDAgKzEsMjIgQEAKKy0tIHNvdXJjZSBpbmNsdWRlL2hh
dmVfaW5ub2RiLmluYworCitsZXQgJGZpbGVfZm9ybWF0PWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9m
b3JtYXRgOworbGV0ICRmaWxlX2Zvcm1hdF9jaGVjaz1gc2VsZWN0IEBAaW5ub2RiX2ZpbGVfZm9y
bWF0X2NoZWNrYDsKK2xldCAkZmlsZV9wZXJfdGFibGU9YHNlbGVjdCBAQGlubm9kYl9maWxlX3Bl
cl90YWJsZWA7CisKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0PSdCYXJyYWN1ZGEnOwor
U0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9b247CisKK3NldCBvbGRfYWx0ZXJfdGFi
bGU9MDsKKworQ1JFQVRFIFRBQkxFIGJ1ZzUzNTkxKGEgdGV4dCBjaGFyc2V0IHV0Zjggbm90IG51
bGwpCitFTkdJTkU9SW5ub0RCIEtFWV9CTE9DS19TSVpFPTE7CistLSBlcnJvciAxMzkKK0FMVEVS
IFRBQkxFIGJ1ZzUzNTkxIEFERCBQUklNQVJZIEtFWShhKDIyMCkpOworU0hPVyBXQVJOSU5HUzsK
KworRFJPUCBUQUJMRSBidWc1MzU5MTsKKworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zv
cm1hdD0kZmlsZV9mb3JtYXQ7CitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfZm9ybWF0X2No
ZWNrPSRmaWxlX2Zvcm1hdF9jaGVjazsKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJf
dGFibGU9JGZpbGVfcGVyX3RhYmxlOwoKPT09IG1vZGlmaWVkIGZpbGUgJ3N0b3JhZ2UvaW5ub2Jh
c2UvaGFuZGxlci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL2hhbmRs
ZXIvaGFuZGxlcjBhbHRlci5jYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwNTEy
MDkxMzUwLWlkYnp3MmloZHFsZ2tmY2gKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hh
bmRsZXIwYWx0ZXIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA1MTIxMTE5
MjYtamF6OTQ3eWZpcDFleHhpeApAQCAtODk2LDYgKzg5Niw4IEBAIGVycm9yOgogCQlwcmVidWls
dC0+dHJ4LT5lcnJvcl9pbmZvID0gTlVMTDsKIAkJLyogZmFsbCB0aHJvdWdoICovCiAJZGVmYXVs
dDoKKwkJdHJ4LT5lcnJvcl9zdGF0ZSA9IERCX1NVQ0NFU1M7CisKIAkJaWYgKG5ld19wcmltYXJ5
KSB7CiAJCQlpZiAoaW5kZXhlZF90YWJsZSAhPSBpbm5vZGJfdGFibGUpIHsKIAkJCQlyb3dfbWVy
Z2VfZHJvcF90YWJsZSh0cngsIGluZGV4ZWRfdGFibGUpOwoK

--===============1369339575==
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: d18918d7d045f67f8dd90b9c3bc2ed24f0933aee
# timestamp: 2010-05-12 14:23:41 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   idbzw2ihdqlgkfch
# 
# Begin bundle
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


--===============1369339575==--