From: marko.makela
Date: April 5 2011 10:58am
Subject: bzr commit into mysql-5.5-innodb branch (marko.makela:3358)
List-Archive: http://lists.mysql.com/commits/134703
Message-Id: <201104051058.p35Awu3j025889@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1359112984=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS81LjUtaW5ub2RiLyBi
YXNlZCBvbiByZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTA3Mzc1OC1iOHk3
MzN5dmtxdW05NDBpCgogMzM1OCBNYXJrbyBNw6RrZWzDpAkyMDExLTA0LTA1CiAgICAgIFJlbW92
ZSB1bnVzZWQgZnVuY3Rpb25zLgogICAgICBvc190aHJlYWRfZ2V0X2N1cnIoKSwgb3NfdGhyZWFk
X2dldF9wcmlvcml0eSgpLCBvc190aHJlYWRfc2V0X3ByaW9yaXR5KCksCiAgICAgIG9zX3RocmVh
ZF9nZXRfbGFzdF9lcnJvcigpOiBSZW1vdmUuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2Uv
aW5ub2Jhc2UvaW5jbHVkZS9vczB0aHJlYWQuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL29zL29z
MHRocmVhZC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvb3Mw
dGhyZWFkLmgnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczB0aHJlYWQuaAlyZXZp
ZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTA3Mzc1OC1iOHk3MzN5dmtxdW05NDBp
CisrKyBiL3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9vczB0aHJlYWQuaAlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDExMDQwNTEwNTgzNy1pd3MwbGdvbTg3aWdweDF0CkBAIC0xMTgs
MTMgKzExOCw2IEBAIG9zX3RocmVhZF9pZF90CiBvc190aHJlYWRfZ2V0X2N1cnJfaWQodm9pZCk7
CiAvKj09PT09PT09PT09PT09PT09PT09PT09PSovCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1SZXR1cm5zIGhh
bmRsZSB0byB0aGUgY3VycmVudCB0aHJlYWQuCi1AcmV0dXJuCWN1cnJlbnQgdGhyZWFkIGhhbmRs
ZSAqLwotVU5JVl9JTlRFUk4KLW9zX3RocmVhZF90Ci1vc190aHJlYWRfZ2V0X2N1cnIodm9pZCk7
Ci0vKj09PT09PT09PT09PT09PT09PT09Ki8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIEFkdmlzZXMgdGhlIG9z
IHRvIGdpdmUgdXAgcmVtYWluZGVyIG9mIHRoZSB0aHJlYWQncyB0aW1lIHNsaWNlLiAqLwogVU5J
Vl9JTlRFUk4KIHZvaWQKQEAgLTEzNywyOSArMTMwLDYgQEAgdm9pZAogb3NfdGhyZWFkX3NsZWVw
KAogLyo9PT09PT09PT09PT0qLwogCXVsaW50CXRtKTsJLyohPCBpbjogdGltZSBpbiBtaWNyb3Nl
Y29uZHMgKi8KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCi1HZXRzIGEgdGhyZWFkIHByaW9yaXR5LgotQHJldHVy
bglwcmlvcml0eSAqLwotVU5JVl9JTlRFUk4KLXVsaW50Ci1vc190aHJlYWRfZ2V0X3ByaW9yaXR5
KAotLyo9PT09PT09PT09PT09PT09PT09Ki8KLQlvc190aHJlYWRfdAloYW5kbGUpOy8qITwgaW46
IE9TIGhhbmRsZSB0byB0aGUgdGhyZWFkICovCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotU2V0cyBhIHRocmVh
ZCBwcmlvcml0eS4gKi8KLVVOSVZfSU5URVJOCi12b2lkCi1vc190aHJlYWRfc2V0X3ByaW9yaXR5
KAotLyo9PT09PT09PT09PT09PT09PT09Ki8KLQlvc190aHJlYWRfdAloYW5kbGUsCS8qITwgaW46
IE9TIGhhbmRsZSB0byB0aGUgdGhyZWFkICovCi0JdWxpbnQJCXByaSk7CS8qITwgaW46IHByaW9y
aXR5OiBvbmUgb2YgT1NfUFJJT1JJVFlfLi4uICovCi0vKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLy8qKgotR2V0cyB0aGUg
bGFzdCBvcGVyYXRpbmcgc3lzdGVtIGVycm9yIGNvZGUgZm9yIHRoZSBjYWxsaW5nIHRocmVhZC4K
LUByZXR1cm4JbGFzdCBlcnJvciBvbiBXaW5kb3dzLCAwIG90aGVyd2lzZSAqLwotVU5JVl9JTlRF
Uk4KLXVsaW50Ci1vc190aHJlYWRfZ2V0X2xhc3RfZXJyb3Iodm9pZCk7Ci0vKj09PT09PT09PT09
PT09PT09PT09PT09PT09Ki8KIAogI2lmbmRlZiBVTklWX05PTklOTAogI2luY2x1ZGUgIm9zMHRo
cmVhZC5pYyIKCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL29zL29zMHRocmVh
ZC5jJwotLS0gYS9zdG9yYWdlL2lubm9iYXNlL29zL29zMHRocmVhZC5jCXJldmlkOm1hcmtvLm1h
a2VsYUBvcmFjbGUuY29tLTIwMTEwNDA1MDczNzU4LWI4eTczM3l2a3F1bTk0MGkKKysrIGIvc3Rv
cmFnZS9pbm5vYmFzZS9vcy9vczB0aHJlYWQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNv
bS0yMDExMDQwNTEwNTgzNy1pd3MwbGdvbTg3aWdweDF0CkBAIC0yMjAsMjEgKzIyMCw2IEBAIG9z
X3RocmVhZF9leGl0KAogfQogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1SZXR1cm5zIGhhbmRsZSB0byB0aGUg
Y3VycmVudCB0aHJlYWQuCi1AcmV0dXJuCWN1cnJlbnQgdGhyZWFkIGhhbmRsZSAqLwotVU5JVl9J
TlRFUk4KLW9zX3RocmVhZF90Ci1vc190aHJlYWRfZ2V0X2N1cnIodm9pZCkKLS8qPT09PT09PT09
PT09PT09PT09PT0qLwotewotI2lmZGVmIF9fV0lOX18KLQlyZXR1cm4oR2V0Q3VycmVudFRocmVh
ZCgpKTsKLSNlbHNlCi0JcmV0dXJuKHB0aHJlYWRfc2VsZigpKTsKLSNlbmRpZgotfQotCi0vKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCiBBZHZpc2VzIHRoZSBvcyB0byBnaXZlIHVwIHJlbWFpbmRlciBvZiB0aGUgdGhy
ZWFkJ3MgdGltZSBzbGljZS4gKi8KIFVOSVZfSU5URVJOCiB2b2lkCkBAIC0yNzQsODEgKzI1OSwz
IEBAIG9zX3RocmVhZF9zbGVlcCgKIAlzZWxlY3QoMCwgTlVMTCwgTlVMTCwgTlVMTCwgJnQpOwog
I2VuZGlmCiB9Ci0KLSNpZm5kZWYgVU5JVl9IT1RCQUNLVVAKLS8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovLyoqCi1TZXRz
IGEgdGhyZWFkIHByaW9yaXR5LiAqLwotVU5JVl9JTlRFUk4KLXZvaWQKLW9zX3RocmVhZF9zZXRf
cHJpb3JpdHkoCi0vKj09PT09PT09PT09PT09PT09PT0qLwotCW9zX3RocmVhZF90CWhhbmRsZSwJ
LyohPCBpbjogT1MgaGFuZGxlIHRvIHRoZSB0aHJlYWQgKi8KLQl1bGludAkJcHJpKQkvKiE8IGlu
OiBwcmlvcml0eSAqLwotewotI2lmZGVmIF9fV0lOX18KLQlpbnQJb3NfcHJpOwotCi0JaWYgKHBy
aSA9PSBPU19USFJFQURfUFJJT1JJVFlfQkFDS0dST1VORCkgewotCQlvc19wcmkgPSBUSFJFQURf
UFJJT1JJVFlfQkVMT1dfTk9STUFMOwotCX0gZWxzZSBpZiAocHJpID09IE9TX1RIUkVBRF9QUklP
UklUWV9OT1JNQUwpIHsKLQkJb3NfcHJpID0gVEhSRUFEX1BSSU9SSVRZX05PUk1BTDsKLQl9IGVs
c2UgaWYgKHByaSA9PSBPU19USFJFQURfUFJJT1JJVFlfQUJPVkVfTk9STUFMKSB7Ci0JCW9zX3By
aSA9IFRIUkVBRF9QUklPUklUWV9ISUdIRVNUOwotCX0gZWxzZSB7Ci0JCXV0X2Vycm9yOwotCX0K
LQotCXV0X2EoU2V0VGhyZWFkUHJpb3JpdHkoaGFuZGxlLCBvc19wcmkpKTsKLSNlbHNlCi0JVVRf
Tk9UX1VTRUQoaGFuZGxlKTsKLQlVVF9OT1RfVVNFRChwcmkpOwotI2VuZGlmCi19Ci0KLS8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovLyoqCi1HZXRzIGEgdGhyZWFkIHByaW9yaXR5LgotQHJldHVybglwcmlvcml0eSAqLwot
VU5JVl9JTlRFUk4KLXVsaW50Ci1vc190aHJlYWRfZ2V0X3ByaW9yaXR5KAotLyo9PT09PT09PT09
PT09PT09PT09Ki8KLQlvc190aHJlYWRfdAloYW5kbGUgX19hdHRyaWJ1dGVfXygodW51c2VkKSkp
Ci0JCQkJLyohPCBpbjogT1MgaGFuZGxlIHRvIHRoZSB0aHJlYWQgKi8KLXsKLSNpZmRlZiBfX1dJ
Tl9fCi0JaW50CW9zX3ByaTsKLQl1bGludAlwcmk7Ci0KLQlvc19wcmkgPSBHZXRUaHJlYWRQcmlv
cml0eShoYW5kbGUpOwotCi0JaWYgKG9zX3ByaSA9PSBUSFJFQURfUFJJT1JJVFlfQkVMT1dfTk9S
TUFMKSB7Ci0JCXByaSA9IE9TX1RIUkVBRF9QUklPUklUWV9CQUNLR1JPVU5EOwotCX0gZWxzZSBp
ZiAob3NfcHJpID09IFRIUkVBRF9QUklPUklUWV9OT1JNQUwpIHsKLQkJcHJpID0gT1NfVEhSRUFE
X1BSSU9SSVRZX05PUk1BTDsKLQl9IGVsc2UgaWYgKG9zX3ByaSA9PSBUSFJFQURfUFJJT1JJVFlf
SElHSEVTVCkgewotCQlwcmkgPSBPU19USFJFQURfUFJJT1JJVFlfQUJPVkVfTk9STUFMOwotCX0g
ZWxzZSB7Ci0JCXV0X2Vycm9yOwotCX0KLQotCXJldHVybihwcmkpOwotI2Vsc2UKLQlyZXR1cm4o
MCk7Ci0jZW5kaWYKLX0KLQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKLUdldHMgdGhlIGxhc3Qgb3BlcmF0aW5n
IHN5c3RlbSBlcnJvciBjb2RlIGZvciB0aGUgY2FsbGluZyB0aHJlYWQuCi1AcmV0dXJuCWxhc3Qg
ZXJyb3Igb24gV2luZG93cywgMCBvdGhlcndpc2UgKi8KLVVOSVZfSU5URVJOCi11bGludAotb3Nf
dGhyZWFkX2dldF9sYXN0X2Vycm9yKHZvaWQpCi0vKj09PT09PT09PT09PT09PT09PT09PT09PT09
Ki8KLXsKLSNpZmRlZiBfX1dJTl9fCi0JcmV0dXJuKEdldExhc3RFcnJvcigpKTsKLSNlbHNlCi0J
cmV0dXJuKDApOwotI2VuZGlmCi19Ci0jZW5kaWYgLyogIVVOSVZfSE9UQkFDS1VQICovCgo=

--===============1359112984==
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: a21204ab10e64505bdf86e430397cad207d1dcd6
# timestamp: 2011-04-05 13:58:43 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   b8y733yvkqum940i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe4IM3kAAjLflAAQUmf/91MC
EAC/7//wBAAIAFAEOdedsCrbWRqqCSip+jVPJpPDVNPFPyoG2qNDQGgAwAAAAA0GgDQDQCSIKp7A
TDSm0KbUGho2oMjTRhlIAjGkwhhMTQyYRoAaCSSaZGmiekwImmjTUnkh6mTJp6mmsx7F1+Hid86M
uHZhS1UcdLV74xnJ6aRryMDcMzDMvv9ljGbGFz3snZyMYL/Z8/qdfTwN5keToJ3WZbDR/cYBqr4k
qoJSCwGQl1CKGqgNx6g9yDkDISwCJ075wKX79JS2WQl4s65oVZmW2TNiKGZYMmZuDwfY/vi9Co8V
ffFwL5goicBUQYHULjaL2BlrEqgOH+wnhqJNrQTusfOwFeB6eXMvqihdyWlsH0iw1ooOKDX48lLc
Q30sOGrF/kKndqnQ4rGC1kIfgETdpF+ZFZ8kLi9ky0q1IQibUrqYmrYC3xRx6sM3uI5HPThZQtGk
Dnm5fECgoA8wxmWC8iJ0y1DQFgUY8rQ1wHhx0mVSbBT4mwsiueZaYxKuet0TIFjd0y4OCcq3sUGC
wS+LHlaMys3iLd16hlpTCle4omhUrhhoHFghIT85tRA9/CTxdgqDA1xVYSE4ldSswwCJS0DDhQRh
sJ8SFYF5Ax9QLXlzp37yJSLqO9dgsrKxTcNzJwLeBWLAMuBpMrNGyLxz6V34gzYNbPJpWIpBTcG9
jSViI2NIT/dbe24ci49iqo6djbAXXkhQmMmZvq6sR23s15amkzXMh139JQCAUiLt0MxdC4mUJvS2
SF+5d8xLARxswvcjNC3bDY7OtLg9Cja1acwp2dsfkHgZw5CzY29fMBh5MXyJi5eJ4i8ZTFaK89Kz
lz0ZhJ1gJVTh53kxfIzM+l112cCwJg0UVI/q02FgnyF1WNlnQ8c04Scw/4mcyo8MTudzzN/A0Y2w
sRoIntlbZyuuZ2XXxutqZt+GnqJfZeskwM8q4aShzmRQypD0OqF0yUjQibyBEVCiWr6JniSYew2A
tV6AWAdlw4NsK3QRNYuNTD1vQ2QV6qYF2Ynj+PwuqMJf5ri+5EqHVHg4tArNtMxNuhfGqLBKQctw
kiTkBB5aJMG4EuH72QVnzQh4NyQsw/J1TD64q0heUqewlJQijiRgrWRFtYCdq+wVTA9y6cxKE8UL
sAxBHdnr8CXRFRau6C6I1YbYzMaA9GGB1DdlyJb8QMw1yqoeTOkHf3EQSlSijfwLSIkyye+dIkIC
YW/5AcKpg90p3VtyYct2Q5UHduk0xeBBlcw8bIjrzCDV2Yh6dxTCVON5zmjAKhPcFFnj9L15fkGs
FS6d30wwYqWiOgUAoBUi7MYoDvqGUVD/zL8foXckU4UJDuCDN5A=


--===============1359112984==--