From: marko.makela
Date: May 12 2010 10:42am
Subject: bzr commit into mysql-5.1-innodb branch (marko.makela:3462) Bug#53591
List-Archive: http://lists.mysql.com/commits/108101
X-Bug: 53591
Message-Id: <201005121042.o4CAAIiW017719@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1423108239=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwtNS4xLWlubm9kYjIvIGJh
c2VkIG9uIHJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMDYwOTIyLW9oNzE2
dWdwdWtmYWt3dmgKCiAzNDYyIE1hcmtvIE3DpGtlbMOkCTIwMTAtMDUtMTIKICAgICAgaGFfaW5u
b2Jhc2U6OmFkZF9pbmRleCgpOiBSZXNldCB0cngtPmVycm9yX3N0YXRlIGluIGVycm9yIGhhbmRs
aW5nLgogICAgICAoQnVnICM1MzU5MSkKCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0
ZS9pbm5vZGJfcGx1Z2luL3IvaW5ub2RiX2J1ZzUzNTkxLnJlc3VsdAogICAgICBteXNxbC10ZXN0
L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTM1OTEudGVzdAogICAgbW9kaWZpZWQ6
CiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9oYW5kbGVyL2hhbmRsZXIwYWx0ZXIuY2MKPT09
IGFkZGVkIGZpbGUgJ215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9kYl9idWc1
MzU5MS5yZXN1bHQnCi0tLSBhL215c3FsLXRlc3Qvc3VpdGUvaW5ub2RiX3BsdWdpbi9yL2lubm9k
Yl9idWc1MzU5MS5yZXN1bHQJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNxbC10
ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vci9pbm5vZGJfYnVnNTM1OTEucmVzdWx0CXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMTA0MjEyLWUyaDluMW9ieGpiOHRmZzQKQEAg
LTAsMCArMSwxNiBAQAorU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9J0JhcnJhY3VkYSc7
CitTRVQgR0xPQkFMIGlubm9kYl9maWxlX3Blcl90YWJsZT1vbjsKK3NldCBvbGRfYWx0ZXJfdGFi
bGU9MDsKK0NSRUFURSBUQUJMRSBidWc1MzU5MShhIHRleHQgY2hhcnNldCB1dGY4IG5vdCBudWxs
KQorRU5HSU5FPUlubm9EQiBLRVlfQkxPQ0tfU0laRT0xOworQUxURVIgVEFCTEUgYnVnNTM1OTEg
QUREIFBSSU1BUlkgS0VZKGEoMjIwKSk7CitFUlJPUiBIWTAwMDogVG9vIGJpZyByb3cKK1NIT1cg
V0FSTklOR1M7CitMZXZlbAlDb2RlCU1lc3NhZ2UKK0Vycm9yCTEzOQlUb28gYmlnIHJvdworRXJy
b3IJMTExOAlSb3cgc2l6ZSB0b28gbGFyZ2UuIFRoZSBtYXhpbXVtIHJvdyBzaXplIGZvciB0aGUg
dXNlZCB0YWJsZSB0eXBlLCBub3QgY291bnRpbmcgQkxPQnMsIGlzIDgxMjYuIFlvdSBoYXZlIHRv
IGNoYW5nZSBzb21lIGNvbHVtbnMgdG8gVEVYVCBvciBCTE9CcworRXJyb3IJMTAzMAlHb3QgZXJy
b3IgMTM5IGZyb20gc3RvcmFnZSBlbmdpbmUKK0RST1AgVEFCTEUgYnVnNTM1OTE7CitTRVQgR0xP
QkFMIGlubm9kYl9maWxlX2Zvcm1hdD1BbnRlbG9wZTsKK1NFVCBHTE9CQUwgaW5ub2RiX2ZpbGVf
Zm9ybWF0X2NoZWNrPUFudGVsb3BlOworU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9wZXJfdGFibGU9
MDsKCj09PSBhZGRlZCBmaWxlICdteXNxbC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5v
ZGJfYnVnNTM1OTEudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGJfcGx1Z2luL3Qv
aW5ub2RiX2J1ZzUzNTkxLnRlc3QJMTk3MC0wMS0wMSAwMDowMDowMCArMDAwMAorKysgYi9teXNx
bC10ZXN0L3N1aXRlL2lubm9kYl9wbHVnaW4vdC9pbm5vZGJfYnVnNTM1OTEudGVzdAlyZXZpZDpt
YXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEwNDIxMi1lMmg5bjFvYnhqYjh0Zmc0CkBA
IC0wLDAgKzEsMjIgQEAKKy0tIHNvdXJjZSBpbmNsdWRlL2hhdmVfaW5ub2RiX3BsdWdpbi5pbmMK
KworbGV0ICRmaWxlX2Zvcm1hdD1gc2VsZWN0IEBAaW5ub2RiX2ZpbGVfZm9ybWF0YDsKK2xldCAk
ZmlsZV9mb3JtYXRfY2hlY2s9YHNlbGVjdCBAQGlubm9kYl9maWxlX2Zvcm1hdF9jaGVja2A7Cits
ZXQgJGZpbGVfcGVyX3RhYmxlPWBzZWxlY3QgQEBpbm5vZGJfZmlsZV9wZXJfdGFibGVgOworCitT
RVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdD0nQmFycmFjdWRhJzsKK1NFVCBHTE9CQUwgaW5u
b2RiX2ZpbGVfcGVyX3RhYmxlPW9uOworCitzZXQgb2xkX2FsdGVyX3RhYmxlPTA7CisKK0NSRUFU
RSBUQUJMRSBidWc1MzU5MShhIHRleHQgY2hhcnNldCB1dGY4IG5vdCBudWxsKQorRU5HSU5FPUlu
bm9EQiBLRVlfQkxPQ0tfU0laRT0xOworLS0gZXJyb3IgMTM5CitBTFRFUiBUQUJMRSBidWc1MzU5
MSBBREQgUFJJTUFSWSBLRVkoYSgyMjApKTsKK1NIT1cgV0FSTklOR1M7CisKK0RST1AgVEFCTEUg
YnVnNTM1OTE7CisKK0VWQUwgU0VUIEdMT0JBTCBpbm5vZGJfZmlsZV9mb3JtYXQ9JGZpbGVfZm9y
bWF0OworRVZBTCBTRVQgR0xPQkFMIGlubm9kYl9maWxlX2Zvcm1hdF9jaGVjaz0kZmlsZV9mb3Jt
YXRfY2hlY2s7CitFVkFMIFNFVCBHTE9CQUwgaW5ub2RiX2ZpbGVfcGVyX3RhYmxlPSRmaWxlX3Bl
cl90YWJsZTsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxl
ci9oYW5kbGVyMGFsdGVyLmNjJwotLS0gYS9zdG9yYWdlL2lubm9kYl9wbHVnaW4vaGFuZGxlci9o
YW5kbGVyMGFsdGVyLmNjCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwNTEyMDYw
OTIyLW9oNzE2dWdwdWtmYWt3dmgKKysrIGIvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL2hhbmRsZXIv
aGFuZGxlcjBhbHRlci5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDEwMDUxMjEw
NDIxMi1lMmg5bjFvYnhqYjh0Zmc0CkBAIC04OTQsNiArODk0LDggQEAgZXJyb3I6CiAJCXByZWJ1
aWx0LT50cngtPmVycm9yX2luZm8gPSBOVUxMOwogCQkvKiBmYWxsIHRocm91Z2ggKi8KIAlkZWZh
dWx0OgorCQl0cngtPmVycm9yX3N0YXRlID0gREJfU1VDQ0VTUzsKKwogCQlpZiAobmV3X3ByaW1h
cnkpIHsKIAkJCWlmIChpbmRleGVkX3RhYmxlICE9IGlubm9kYl90YWJsZSkgewogCQkJCXJvd19t
ZXJnZV9kcm9wX3RhYmxlKHRyeCwgaW5kZXhlZF90YWJsZSk7Cgo=

--===============1423108239==
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-innodb2/
# testament_sha1: 14430fef1f95711d61e991947370a4f1669f334e
# timestamp: 2010-05-12 13:42:21 +0300
# source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   oh716ugpukfakwvh
# 
# Begin bundle
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


--===============1423108239==--