From: marko.makela
Date: August 17 2010 12:07pm
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3164)
List-Archive: http://lists.mysql.com/commits/115938
Message-Id: <201008171208.o7HAGTH2003228@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0770251203=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwODE3MTE1NDI5LXlwcHZt
cGhjMmcza2o4a3YKCiAzMTY0IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDgtMTcKICAgICAgQSBub24t
ZnVuY3Rpb25hbCBjaGFuZ2U6CiAgICAgIAogICAgICBkaWN0X2xvYWRfaW5kZXhfbG93KCk6IFJl
bmFtZSB0aGUgcGFyYW1ldGVyICJjYWNoZWQiIHRvICJhbGxvY2F0ZWQiCiAgICAgIGFuZCBjbGFy
aWZ5IHRoZSBjb21tZW50cy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9k
aWN0L2RpY3QwbG9hZC5jCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxvYWQu
aAo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jJwot
LS0gYS9zdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2FkLmMJcmV2aWQ6dmFzaWwuZGltb3ZA
b3JhY2xlLmNvbS0yMDEwMDgxNzExNTQyOS15cHB2bXBoYzJnM2tqOGt2CisrKyBiL3N0b3JhZ2Uv
aW5ub2Jhc2UvZGljdC9kaWN0MGxvYWQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDgxNzEyMDc1NC05OHJwMmJvamt3NWYzOG5mCkBAIC0xMTc1LDIzICsxMTc1LDIzIEBAIHN0
YXRpYyBjb25zdCBjaGFyKiBkaWN0X2xvYWRfaW5kZXhfaWRfZXIKIAogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8q
KgogTG9hZHMgYW4gaW5kZXggZGVmaW5pdGlvbiBmcm9tIGEgU1lTX0lOREVYRVMgcmVjb3JkIHRv
IGRpY3RfaW5kZXhfdC4KLUlmICJjYWNoZWQiIGlzIHNldCB0byAiVFJVRSIsIHdlIHdpbGwgY3Jl
YXRlIGEgZGljdF9pbmRleF90IHN0cnVjdHVyZQotYW5kIGZpbGwgaXQgYWNjb3JkaW5nbHkuIE90
aGVyd2lzZSwgdGhlIGRpY3RfaW5kZXhfdCB3aWxsCi1iZSBzdXBwbGllZCBieSB0aGUgY2FsbGVy
IGFuZCBmaWxsZWQgd2l0aCBpbmZvcm1hdGlvbiByZWFkIGZyb20KLXRoZSByZWNvcmQuCi1AcmV0
dXJuIGVycm9yIG1lc3NhZ2UsIG9yIE5VTEwgb24gc3VjY2VzcyAqLworSWYgYWxsb2NhdGU9VFJV
RSwgd2Ugd2lsbCBjcmVhdGUgYSBkaWN0X2luZGV4X3Qgc3RydWN0dXJlIGFuZCBmaWxsIGl0Cith
Y2NvcmRpbmdseS4gSWYgYWxsb2NhdGVkPUZBTFNFLCB0aGUgZGljdF9pbmRleF90IHdpbGwgYmUg
c3VwcGxpZWQgYnkKK3RoZSBjYWxsZXIgYW5kIGZpbGxlZCB3aXRoIGluZm9ybWF0aW9uIHJlYWQg
ZnJvbSB0aGUgcmVjb3JkLiAgQHJldHVybgorZXJyb3IgbWVzc2FnZSwgb3IgTlVMTCBvbiBzdWNj
ZXNzICovCiBVTklWX0lOVEVSTgogY29uc3QgY2hhcioKIGRpY3RfbG9hZF9pbmRleF9sb3coCiAv
Kj09PT09PT09PT09PT09PT0qLwogCWJ5dGUqCQl0YWJsZV9pZCwJLyohPCBpbi9vdXQ6IHRhYmxl
IGlkICg4IGJ5dGVzKSwKLQkJCQkJYW4gImluIiB2YWx1ZSBpZiBjYWNoZWQ9VFJVRQotCQkJCQlh
bmQgIm91dCIgd2hlbiBjYWNoZWQ9RkFMU0UgKi8KKwkJCQkJYW4gImluIiB2YWx1ZSBpZiBhbGxv
Y2F0ZT1UUlVFCisJCQkJCWFuZCAib3V0IiB3aGVuIGFsbG9jYXRlPUZBTFNFICovCiAJY29uc3Qg
Y2hhcioJdGFibGVfbmFtZSwJLyohPCBpbjogdGFibGUgbmFtZSAqLwogCW1lbV9oZWFwX3QqCWhl
YXAsCQkvKiE8IGluL291dDogdGVtcG9yYXJ5IG1lbW9yeSBoZWFwICovCiAJY29uc3QgcmVjX3Qq
CXJlYywJCS8qITwgaW46IFNZU19JTkRFWEVTIHJlY29yZCAqLwotCWlib29sCQljYWNoZWQsCQkv
KiE8IGluOiBUUlVFID0gYWRkIHRvIGNhY2hlLAotCQkJCQlGQUxTRSA9IGRvIG5vdCAqLworCWli
b29sCQlhbGxvY2F0ZSwJLyohPCBpbjogVFJVRT1hbGxvY2F0ZSAqaW5kZXgsCisJCQkJCUZBTFNF
PWZpbGwgaW4gYSBwcmUtYWxsb2NhdGVkCisJCQkJCSppbmRleCAqLwogCWRpY3RfaW5kZXhfdCoq
CWluZGV4KQkJLyohPCBvdXQsb3duOiBpbmRleCwgb3IgTlVMTCAqLwogewogCWNvbnN0IGJ5dGUq
CWZpZWxkOwpAQCAtMTIwMyw4ICsxMjAzLDggQEAgZGljdF9sb2FkX2luZGV4X2xvdygKIAl1bGlu
dAkJdHlwZTsKIAl1bGludAkJc3BhY2U7CiAKLQlpZiAoY2FjaGVkKSB7Ci0JCS8qIElmICJjYWNo
ZWQiIGlzIHNldCB0byBUUlVFLCBubyBkaWN0X2luZGV4X3Qgd2lsbAorCWlmIChhbGxvY2F0ZSkg
eworCQkvKiBJZiBhbGxvY2F0ZT1UUlVFLCBubyBkaWN0X2luZGV4X3Qgd2lsbAogCQliZSBzdXBw
bGllZC4gSW5pdGlhbGl6ZSAiKmluZGV4IiB0byBOVUxMICovCiAJCSppbmRleCA9IE5VTEw7CiAJ
fQpAQCAtMTIyMyw3ICsxMjIzLDcgQEAgZXJyX2xlbjoKIAkJcmV0dXJuKCJpbmNvcnJlY3QgY29s
dW1uIGxlbmd0aCBpbiBTWVNfSU5ERVhFUyIpOwogCX0KIAotCWlmICghY2FjaGVkKSB7CisJaWYg
KCFhbGxvY2F0ZSkgewogCQkvKiBXZSBhcmUgcmVhZGluZyBhIFNZU19JTkRFWEVTIHJlY29yZC4g
Q29weSB0aGUgdGFibGVfaWQgKi8KIAkJbWVtY3B5KHRhYmxlX2lkLCAoY29uc3QgY2hhciopZmll
bGQsIDgpOwogCX0gZWxzZSBpZiAobWVtY21wKGZpZWxkLCB0YWJsZV9pZCwgOCkpIHsKQEAgLTEy
NzksNyArMTI3OSw3IEBAIGVycl9sZW46CiAJCWdvdG8gZXJyX2xlbjsKIAl9CiAKLQlpZiAoY2Fj
aGVkKSB7CisJaWYgKGFsbG9jYXRlKSB7CiAJCSppbmRleCA9IGRpY3RfbWVtX2luZGV4X2NyZWF0
ZSh0YWJsZV9uYW1lLCBuYW1lX2J1ZiwKIAkJCQkJICAgICAgIHNwYWNlLCB0eXBlLCBuX2ZpZWxk
cyk7CiAJfSBlbHNlIHsKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvZGljdDBsb2FkLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxvYWQu
aAlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwODE3MTE1NDI5LXlwcHZtcGhjMmcz
a2o4a3YKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwODE3MTIwNzU0LTk4cnAyYm9qa3c1ZjM4bmYKQEAg
LTExNiwxOSArMTE2LDIzIEBAIGRpY3RfbG9hZF9jb2x1bW5fbG93KAogCWNvbnN0IHJlY190Kgly
ZWMpOwkJLyohPCBpbjogU1lTX0NPTFVNTlMgcmVjb3JkICovCiAvKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCiBM
b2FkcyBhbiBpbmRleCBkZWZpbml0aW9uIGZyb20gYSBTWVNfSU5ERVhFUyByZWNvcmQgdG8gZGlj
dF9pbmRleF90LgotQHJldHVybiBlcnJvciBtZXNzYWdlLCBvciBOVUxMIG9uIHN1Y2Nlc3MgKi8K
K0lmIGFsbG9jYXRlPVRSVUUsIHdlIHdpbGwgY3JlYXRlIGEgZGljdF9pbmRleF90IHN0cnVjdHVy
ZSBhbmQgZmlsbCBpdAorYWNjb3JkaW5nbHkuIElmIGFsbG9jYXRlZD1GQUxTRSwgdGhlIGRpY3Rf
aW5kZXhfdCB3aWxsIGJlIHN1cHBsaWVkIGJ5Cit0aGUgY2FsbGVyIGFuZCBmaWxsZWQgd2l0aCBp
bmZvcm1hdGlvbiByZWFkIGZyb20gdGhlIHJlY29yZC4gIEByZXR1cm4KK2Vycm9yIG1lc3NhZ2Us
IG9yIE5VTEwgb24gc3VjY2VzcyAqLwogVU5JVl9JTlRFUk4KIGNvbnN0IGNoYXIqCiBkaWN0X2xv
YWRfaW5kZXhfbG93KAogLyo9PT09PT09PT09PT09PT09Ki8KLQlieXRlKgkJdGFibGVfaWQsCS8q
ITwgaW4vb3V0OiB0YWJsZSBpZCAoOCBieXRlc18sCi0JCQkJCWFuICJpbiIgdmFsdWUgaWYgY2Fj
aGVkPVRSVUUKLQkJCQkJYW5kICJvdXQiIHdoZW4gY2FjaGVkPUZBTFNFICovCisJYnl0ZSoJCXRh
YmxlX2lkLAkvKiE8IGluL291dDogdGFibGUgaWQgKDggYnl0ZXMpLAorCQkJCQlhbiAiaW4iIHZh
bHVlIGlmIGFsbG9jYXRlPVRSVUUKKwkJCQkJYW5kICJvdXQiIHdoZW4gYWxsb2NhdGU9RkFMU0Ug
Ki8KIAljb25zdCBjaGFyKgl0YWJsZV9uYW1lLAkvKiE8IGluOiB0YWJsZSBuYW1lICovCiAJbWVt
X2hlYXBfdCoJaGVhcCwJCS8qITwgaW4vb3V0OiB0ZW1wb3JhcnkgbWVtb3J5IGhlYXAgKi8KIAlj
b25zdCByZWNfdCoJcmVjLAkJLyohPCBpbjogU1lTX0lOREVYRVMgcmVjb3JkICovCi0JaWJvb2wJ
CWNhY2hlZCwJCS8qITwgaW46IFRSVUUgPSBhZGQgdG8gY2FjaGUKLQkJCQkJRkFMU0UgPSBkbyBu
b3QgKi8KKwlpYm9vbAkJYWxsb2NhdGUsCS8qITwgaW46IFRSVUU9YWxsb2NhdGUgKmluZGV4LAor
CQkJCQlGQUxTRT1maWxsIGluIGEgcHJlLWFsbG9jYXRlZAorCQkJCQkqaW5kZXggKi8KIAlkaWN0
X2luZGV4X3QqKglpbmRleCk7CQkvKiE8IG91dCxvd246IGluZGV4LCBvciBOVUxMICovCiAvKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKiovLyoqCiBMb2FkcyBhbiBpbmRleCBmaWVsZCBkZWZpbml0aW9uIGZyb20gYSBTWVNf
RklFTERTIHJlY29yZCB0bwoK

--===============0770251203==
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.5-innodb/
# testament_sha1: be901dc712988a05b8f00a767c9e98d61b530728
# timestamp: 2010-08-17 15:08:01 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   yppvmphc2g3kj8kv
# 
# Begin bundle
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


--===============0770251203==--