From: marko.makela
Date: August 17 2010 12:09pm
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3163 to 3164)
List-Archive: http://lists.mysql.com/commits/115941
Message-Id: <201008171209.o7HAGTH8003228@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1529995251=="

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

IDMxNjQgTWFya28gTcOka2Vsw6QJMjAxMC0wOC0xNwogICAgICBBIG5vbi1mdW5jdGlvbmFsIGNo
YW5nZToKICAgICAgCiAgICAgIGRpY3RfbG9hZF9pbmRleF9sb3coKTogUmVuYW1lIHRoZSBwYXJh
bWV0ZXIgImNhY2hlZCIgdG8gImFsbG9jYXRlZCIKICAgICAgYW5kIGNsYXJpZnkgdGhlIGNvbW1l
bnRzLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2RpY3QvZGljdDBsb2Fk
LmMKICAgICAgc3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oCiAzMTYzIFZhc2ls
IERpbW92CTIwMTAtMDgtMTcKICAgICAgTWFrZSBtYWluLmVuZHNwYWNlIG1vcmUgZGV0ZXJtaW5p
c3RpYwogICAgICAKICAgICAgRm9sbG93dXAgdG8gdmFzaWwuZGltb3ZAb3JhY2xlLmNvbS0yMDEw
MDgxNzA2MzQzMC1pbmdsbXpnZHRqOTV0MjlkCiAgICAgIHdoaWNoIGRpZG4ndCBmdWxseSBmaXgg
dGhlIHRlc3QgYmVjYXVzZSB0aGUgb3JkZXIgb2YgdGhlIHJldHVybmVkCiAgICAgIHJvd3Mgd2Fz
IGRpZmZlcmVudCBpbiBlbWJlZGRlZCBhbmQgbm9uLWVtYmVkZGVkIHZlcnNpb24uIFNvIHRoZSBv
bmx5CiAgICAgIHdheSB0byBmaXggdGhpcyBpcyB0byBhZGQgYW4gT1JERVIgQlkgY2xhdXNlLgoK
ICAgIG1vZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3IvZW5kc3BhY2UucmVzdWx0CiAgICAgIG15
c3FsLXRlc3QvdC9lbmRzcGFjZS50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9i
YXNlL2RpY3QvZGljdDBsb2FkLmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvZGljdC9kaWN0MGxv
YWQuYwlyZXZpZDp2YXNpbC5kaW1vdkBvcmFjbGUuY29tLTIwMTAwODE3MTE1NDI5LXlwcHZtcGhj
Mmcza2o4a3YKKysrIGIvc3RvcmFnZS9pbm5vYmFzZS9kaWN0L2RpY3QwbG9hZC5jCXJldmlkOm1h
cmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAwODE3MTIwNzU0LTk4cnAyYm9qa3c1ZjM4bmYKQEAg
LTExNzUsMjMgKzExNzUsMjMgQEAgc3RhdGljIGNvbnN0IGNoYXIqIGRpY3RfbG9hZF9pbmRleF9p
ZF9lcgogCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKiovLyoqCiBMb2FkcyBhbiBpbmRleCBkZWZpbml0aW9uIGZyb20g
YSBTWVNfSU5ERVhFUyByZWNvcmQgdG8gZGljdF9pbmRleF90LgotSWYgImNhY2hlZCIgaXMgc2V0
IHRvICJUUlVFIiwgd2Ugd2lsbCBjcmVhdGUgYSBkaWN0X2luZGV4X3Qgc3RydWN0dXJlCi1hbmQg
ZmlsbCBpdCBhY2NvcmRpbmdseS4gT3RoZXJ3aXNlLCB0aGUgZGljdF9pbmRleF90IHdpbGwKLWJl
IHN1cHBsaWVkIGJ5IHRoZSBjYWxsZXIgYW5kIGZpbGxlZCB3aXRoIGluZm9ybWF0aW9uIHJlYWQg
ZnJvbQotdGhlIHJlY29yZC4KLUByZXR1cm4gZXJyb3IgbWVzc2FnZSwgb3IgTlVMTCBvbiBzdWNj
ZXNzICovCitJZiBhbGxvY2F0ZT1UUlVFLCB3ZSB3aWxsIGNyZWF0ZSBhIGRpY3RfaW5kZXhfdCBz
dHJ1Y3R1cmUgYW5kIGZpbGwgaXQKK2FjY29yZGluZ2x5LiBJZiBhbGxvY2F0ZWQ9RkFMU0UsIHRo
ZSBkaWN0X2luZGV4X3Qgd2lsbCBiZSBzdXBwbGllZCBieQordGhlIGNhbGxlciBhbmQgZmlsbGVk
IHdpdGggaW5mb3JtYXRpb24gcmVhZCBmcm9tIHRoZSByZWNvcmQuICBAcmV0dXJuCitlcnJvciBt
ZXNzYWdlLCBvciBOVUxMIG9uIHN1Y2Nlc3MgKi8KIFVOSVZfSU5URVJOCiBjb25zdCBjaGFyKgog
ZGljdF9sb2FkX2luZGV4X2xvdygKIC8qPT09PT09PT09PT09PT09PSovCiAJYnl0ZSoJCXRhYmxl
X2lkLAkvKiE8IGluL291dDogdGFibGUgaWQgKDggYnl0ZXMpLAotCQkJCQlhbiAiaW4iIHZhbHVl
IGlmIGNhY2hlZD1UUlVFCi0JCQkJCWFuZCAib3V0IiB3aGVuIGNhY2hlZD1GQUxTRSAqLworCQkJ
CQlhbiAiaW4iIHZhbHVlIGlmIGFsbG9jYXRlPVRSVUUKKwkJCQkJYW5kICJvdXQiIHdoZW4gYWxs
b2NhdGU9RkFMU0UgKi8KIAljb25zdCBjaGFyKgl0YWJsZV9uYW1lLAkvKiE8IGluOiB0YWJsZSBu
YW1lICovCiAJbWVtX2hlYXBfdCoJaGVhcCwJCS8qITwgaW4vb3V0OiB0ZW1wb3JhcnkgbWVtb3J5
IGhlYXAgKi8KIAljb25zdCByZWNfdCoJcmVjLAkJLyohPCBpbjogU1lTX0lOREVYRVMgcmVjb3Jk
ICovCi0JaWJvb2wJCWNhY2hlZCwJCS8qITwgaW46IFRSVUUgPSBhZGQgdG8gY2FjaGUsCi0JCQkJ
CUZBTFNFID0gZG8gbm90ICovCisJaWJvb2wJCWFsbG9jYXRlLAkvKiE8IGluOiBUUlVFPWFsbG9j
YXRlICppbmRleCwKKwkJCQkJRkFMU0U9ZmlsbCBpbiBhIHByZS1hbGxvY2F0ZWQKKwkJCQkJKmlu
ZGV4ICovCiAJZGljdF9pbmRleF90KioJaW5kZXgpCQkvKiE8IG91dCxvd246IGluZGV4LCBvciBO
VUxMICovCiB7CiAJY29uc3QgYnl0ZSoJZmllbGQ7CkBAIC0xMjAzLDggKzEyMDMsOCBAQCBkaWN0
X2xvYWRfaW5kZXhfbG93KAogCXVsaW50CQl0eXBlOwogCXVsaW50CQlzcGFjZTsKIAotCWlmIChj
YWNoZWQpIHsKLQkJLyogSWYgImNhY2hlZCIgaXMgc2V0IHRvIFRSVUUsIG5vIGRpY3RfaW5kZXhf
dCB3aWxsCisJaWYgKGFsbG9jYXRlKSB7CisJCS8qIElmIGFsbG9jYXRlPVRSVUUsIG5vIGRpY3Rf
aW5kZXhfdCB3aWxsCiAJCWJlIHN1cHBsaWVkLiBJbml0aWFsaXplICIqaW5kZXgiIHRvIE5VTEwg
Ki8KIAkJKmluZGV4ID0gTlVMTDsKIAl9CkBAIC0xMjIzLDcgKzEyMjMsNyBAQCBlcnJfbGVuOgog
CQlyZXR1cm4oImluY29ycmVjdCBjb2x1bW4gbGVuZ3RoIGluIFNZU19JTkRFWEVTIik7CiAJfQog
Ci0JaWYgKCFjYWNoZWQpIHsKKwlpZiAoIWFsbG9jYXRlKSB7CiAJCS8qIFdlIGFyZSByZWFkaW5n
IGEgU1lTX0lOREVYRVMgcmVjb3JkLiBDb3B5IHRoZSB0YWJsZV9pZCAqLwogCQltZW1jcHkodGFi
bGVfaWQsIChjb25zdCBjaGFyKilmaWVsZCwgOCk7CiAJfSBlbHNlIGlmIChtZW1jbXAoZmllbGQs
IHRhYmxlX2lkLCA4KSkgewpAQCAtMTI3OSw3ICsxMjc5LDcgQEAgZXJyX2xlbjoKIAkJZ290byBl
cnJfbGVuOwogCX0KIAotCWlmIChjYWNoZWQpIHsKKwlpZiAoYWxsb2NhdGUpIHsKIAkJKmluZGV4
ID0gZGljdF9tZW1faW5kZXhfY3JlYXRlKHRhYmxlX25hbWUsIG5hbWVfYnVmLAogCQkJCQkgICAg
ICAgc3BhY2UsIHR5cGUsIG5fZmllbGRzKTsKIAl9IGVsc2UgewoKPT09IG1vZGlmaWVkIGZpbGUg
J3N0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9kaWN0MGxvYWQuaCcKLS0tIGEvc3RvcmFnZS9pbm5v
YmFzZS9pbmNsdWRlL2RpY3QwbG9hZC5oCXJldmlkOnZhc2lsLmRpbW92QG9yYWNsZS5jb20tMjAx
MDA4MTcxMTU0MjkteXBwdm1waGMyZzNrajhrdgorKysgYi9zdG9yYWdlL2lubm9iYXNlL2luY2x1
ZGUvZGljdDBsb2FkLmgJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDA4MTcxMjA3
NTQtOThycDJib2prdzVmMzhuZgpAQCAtMTE2LDE5ICsxMTYsMjMgQEAgZGljdF9sb2FkX2NvbHVt
bl9sb3coCiAJY29uc3QgcmVjX3QqCXJlYyk7CQkvKiE8IGluOiBTWVNfQ09MVU1OUyByZWNvcmQg
Ki8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKi8vKioKIExvYWRzIGFuIGluZGV4IGRlZmluaXRpb24gZnJvbSBhIFNZ
U19JTkRFWEVTIHJlY29yZCB0byBkaWN0X2luZGV4X3QuCi1AcmV0dXJuIGVycm9yIG1lc3NhZ2Us
IG9yIE5VTEwgb24gc3VjY2VzcyAqLworSWYgYWxsb2NhdGU9VFJVRSwgd2Ugd2lsbCBjcmVhdGUg
YSBkaWN0X2luZGV4X3Qgc3RydWN0dXJlIGFuZCBmaWxsIGl0CithY2NvcmRpbmdseS4gSWYgYWxs
b2NhdGVkPUZBTFNFLCB0aGUgZGljdF9pbmRleF90IHdpbGwgYmUgc3VwcGxpZWQgYnkKK3RoZSBj
YWxsZXIgYW5kIGZpbGxlZCB3aXRoIGluZm9ybWF0aW9uIHJlYWQgZnJvbSB0aGUgcmVjb3JkLiAg
QHJldHVybgorZXJyb3IgbWVzc2FnZSwgb3IgTlVMTCBvbiBzdWNjZXNzICovCiBVTklWX0lOVEVS
TgogY29uc3QgY2hhcioKIGRpY3RfbG9hZF9pbmRleF9sb3coCiAvKj09PT09PT09PT09PT09PT0q
LwotCWJ5dGUqCQl0YWJsZV9pZCwJLyohPCBpbi9vdXQ6IHRhYmxlIGlkICg4IGJ5dGVzXywKLQkJ
CQkJYW4gImluIiB2YWx1ZSBpZiBjYWNoZWQ9VFJVRQotCQkJCQlhbmQgIm91dCIgd2hlbiBjYWNo
ZWQ9RkFMU0UgKi8KKwlieXRlKgkJdGFibGVfaWQsCS8qITwgaW4vb3V0OiB0YWJsZSBpZCAoOCBi
eXRlcyksCisJCQkJCWFuICJpbiIgdmFsdWUgaWYgYWxsb2NhdGU9VFJVRQorCQkJCQlhbmQgIm91
dCIgd2hlbiBhbGxvY2F0ZT1GQUxTRSAqLwogCWNvbnN0IGNoYXIqCXRhYmxlX25hbWUsCS8qITwg
aW46IHRhYmxlIG5hbWUgKi8KIAltZW1faGVhcF90KgloZWFwLAkJLyohPCBpbi9vdXQ6IHRlbXBv
cmFyeSBtZW1vcnkgaGVhcCAqLwogCWNvbnN0IHJlY190KglyZWMsCQkvKiE8IGluOiBTWVNfSU5E
RVhFUyByZWNvcmQgKi8KLQlpYm9vbAkJY2FjaGVkLAkJLyohPCBpbjogVFJVRSA9IGFkZCB0byBj
YWNoZQotCQkJCQlGQUxTRSA9IGRvIG5vdCAqLworCWlib29sCQlhbGxvY2F0ZSwJLyohPCBpbjog
VFJVRT1hbGxvY2F0ZSAqaW5kZXgsCisJCQkJCUZBTFNFPWZpbGwgaW4gYSBwcmUtYWxsb2NhdGVk
CisJCQkJCSppbmRleCAqLwogCWRpY3RfaW5kZXhfdCoqCWluZGV4KTsJCS8qITwgb3V0LG93bjog
aW5kZXgsIG9yIE5VTEwgKi8KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8vKioKIExvYWRzIGFuIGluZGV4IGZpZWxk
IGRlZmluaXRpb24gZnJvbSBhIFNZU19GSUVMRFMgcmVjb3JkIHRvCgo=

--===============1529995251==
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:09:20 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: vasil.dimov@stripped\
#   yppvmphc2g3kj8kv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcubcDAAAwRflCAwcnf/93Mn
HgC//9/4BAAIAGAGP17AAAAAAAAapMI8kzUMEwmR6mgYjQDTJpoAHMJgEwAmEwmmAAATJpoGOYTA
JgBMJhNMAAAmTTQMNT1JAaaGjIxDQ0NDQNGEaNAAOYTAJgBMJhNMAAAmTTQMJIggmmJkyCGQCZNN
Mmo9Apmj0KZgAdB6lcNCYiJviQMG6D9ZLKTZPxzDTQ7NA+27lxB4jroRI4jJCwQYQEB1CgjyolUS
VK4IyLlIT2MwasMHQySLPd0+0nmLgvDECQUICs6A5QVbSGS4QoQ2onYxJ3nLOopZbanKqKpu1TNH
99p2bjduOCyMQ3JOROo5DGJCDufcqgEQ/HByCaZ4rqHKzmPd5/yORqkaS8gQXEgQMIhbSR/wioDF
CiXHuWa8odPHq1s1VXDeUcasCg+QE+A6YZMciiVjqH6YOEV3an+ASF5DGmJ3mfvgMFwt6F+Be8DW
BMuFrMfDbwpVw5ulXFViXWjOC7UHAXmGBmX6ax+MRB4MyFj4IXQKHRAYiJnMRgIukY4kGTKZplD+
BbBaEQY8qH66ELt+PZvN0KLzUnQZSnULUSJgMKttEoyxqUzDuCmr1WB7aXXzFikO1b+bJ28Yji0D
CbPedRE17KjXBjJqzY29Cd6REhqJjkjFnbPSQUmiOqBQ2l7oz72Gb5iKdgEjeaGVJaiOvrMmwIxM
xUw5AJivP9VmhRHwGlxAhSWsEYujS6ontmPMzU0bRTNRAsqs37uawBrFzIuqqLrDkvLhXH6KeSE6
bRfEBt3ImN5lbHG9t4tC3jmvSFWOjIVZA16i2+BC62o2VpEaKDQJzNQAwFCbLDJFGBhgGqBeYVsM
afi8RW7hTIwSMJENSvVeq6MtIxrue+8sIlZYTLT8qwBwPeX10NRbUJkXGLiiT1yI4GGIxEcCjA0U
E/HtO2O69YMVu9lbSutgpODUNJUoopbEUUfZfRY6b9GwHT3kIDDI8g49p5Xi6UcyCw6vuKu4YZht
Hsf6MwwMR9Q9SwRXSMfQpPqKyK9kmkKpDnsl7Fm1mbZsgiCG+/374BBFQQFPkFxMWOldqD9zKzM9
/8eglef+Sb08MVJHUgy+dZuPTub7m5LzPe53las19g7GUw5u/YBv/OtBYhjE2jIB16OKk5+B5nu+
UZ+QF5w6J1nWBxK6Dlb12CTFgvXqNysS7Sw1GbFAuNh2JBWLLET/s1lQ9y0kujLRSO7iUFgJQyvK
isiUpKiBIcg46KR0Q5yAsu3ItLzIp36ApBpEUaCv+XMusW0sL1RWI5BeiN7Da0XdS2ozNV3YEDmR
1q4dajp+hsVIvqVFQA/ZwM/nBuB08xb2FHKV/A1FyXFutPepo1GtiTEzYY0EJscvXhv7Njazotv2
Nb7Of0IuPlirFk4YYnLsh3dJ0w3XlaK0qhEkQxJo/SHUhMcO/3AVmvM3Ch37lGqxexgdx8hgkxzu
OP4UXLsU2Qx0ZjF1w24TblIDRDuLgWuRv+A1m5JYfvFkNwKaVImqbkbRaUMKgkia7Rl4rrR7BaLV
IoLvTlynYXIbrRUXnVI13LyA27BNyoP1ijyW4R8V/gFRoVLC6UcAtRB0KyJ4uJOOxEOcoggzYdCP
l7hX0JAzVKR5mjSAdiD8HUmObhkipb+Ulqi0ax0QiuZUECKsJg4yZMD0kYrB0nSUtoDqDHPITz5W
pFBkMuvn4zZBmIT6eQC0c2AFRoJuLxoJkhj2EtCKQsRzQWjabdiLmrA0GxhggqGVSxX5UyekktdI
wxm5QNBIIanComVFIxNLUV8IqvmmkVorMMSVl5uAqVNADLiQgOn0re1RYjahygOygU0XCaZRQjC8
Y3sJ4wIC+wU99s0tjIJMiy2NAbtJmQFRhr1EC2WlFwMSE82CqZpMigxyKS1GY4pLUFy8BkXFyOCv
VqLVOIE0iKS3mixtI25aSRjiqal/8q+v/C7kinChIZc24GA=


--===============1529995251==--