From: marko.makela
Date: October 27 2010 7:05am
Subject: bzr commit into mysql-next-mr-innodb branch (marko.makela:3273)
List-Archive: http://lists.mysql.com/commits/122030
Message-Id: <201010270706.o9R6kMbO008453@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0038911973=="

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

I0F0IGZpbGU6Ly8vaG9tZS9tYXJrby9pbm5vYmFzZS9kZXYvbXlzcWwyYS9teXNxbC1uZXh0LW1y
LWlubm9kYi8gYmFzZWQgb24gcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcw
NzAzNTItcnM2bXJsZ3gzbGoxZm42cgoKIDMyNzMgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yNwog
ICAgICBSZXBsYWNlIC8qVE9ETy8qLi4uKi8gY29tbWVudHMgdG8gZml4IGdjYyAtV2FsbCAtV2Vy
cm9yLgoKICAgIG1vZGlmaWVkOgogICAgICBzdG9yYWdlL2lubm9iYXNlL2hhbmRsZXIvaGFfaW5u
b2RiLmNjCiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2Uvcm93L3JvdzBzZWwuYwo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYycKLS0tIGEvc3RvcmFn
ZS9pbm5vYmFzZS9oYW5kbGVyL2hhX2lubm9kYi5jYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xl
LmNvbS0yMDEwMTAyNzA3MDM1Mi1yczZtcmxneDNsajFmbjZyCisrKyBiL3N0b3JhZ2UvaW5ub2Jh
c2UvaGFuZGxlci9oYV9pbm5vZGIuY2MJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAx
MDEwMjcwNzA1NDMtcXIxNXowZDg1dGdmYXVnYwpAQCAtNDk4MCw3ICs0OTgwLDcgQEAgaGFfaW5u
b2Jhc2U6OmJ1aWxkX3RlbXBsYXRlKAogCQkJCS8qIEluZGV4IGNvbmRpdGlvbiBwdXNoZG93biBj
YW4gYmUgdXNlZCBvbgogCQkJCWFsbCBjb2x1bW5zIG9mIGEgc2Vjb25kYXJ5IGluZGV4LCBhbmQg
b24KIAkJCQl0aGUgUFJJTUFSWSBLRVkgY29sdW1ucy4gKi8KLQkJCQkvKlRPRE8vKmVuYWJsZSB0
aGlzIGFzc2VydGlvbgorCQkJCS8qIFRPRE86IGVuYWJsZSB0aGlzIGFzc2VydGlvbgogCQkJCShi
dXQgZmlyc3QgZW5zdXJlIHRoYXQgZW5kX3JhbmdlIGlzCiAJCQkJdmFsaWQgaGVyZSBhbmQgdXNl
IGFuIGFjY3VyYXRlIGNvbmRpdGlvbgogCQkJCWZvciBlbmRfcmFuZ2UpCgo9PT0gbW9kaWZpZWQg
ZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MHNlbC5jJwotLS0gYS9zdG9yYWdlL2lubm9i
YXNlL3Jvdy9yb3cwc2VsLmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcw
NzAzNTItcnM2bXJsZ3gzbGoxZm42cgorKysgYi9zdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwc2Vs
LmMJcmV2aWQ6bWFya28ubWFrZWxhQG9yYWNsZS5jb20tMjAxMDEwMjcwNzA1NDMtcXIxNXowZDg1
dGdmYXVnYwpAQCAtNDY0Myw3ICs0NjQzLDcgQEAgbmV4dF9yZWM6CiAJLyotLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKi8KIAkvKiBQ
SEFTRSA1OiBNb3ZlIHRoZSBjdXJzb3IgdG8gdGhlIG5leHQgaW5kZXggcmVjb3JkICovCiAKLQkv
KlRPRE8vKndpdGggSUNQLCBkbyB0aGlzIHdoZW4gc3dpdGNoaW5nIHBhZ2VzLCBldmVyeSBOIHBh
Z2VzICovCisJLyogVE9ETzogd2l0aCBJQ1AsIGRvIHRoaXMgd2hlbiBzd2l0Y2hpbmcgcGFnZXMs
IGV2ZXJ5IE4gcGFnZXMgKi8KIAlpZiAoVU5JVl9VTkxJS0VMWShtdHJfaGFzX2V4dHJhX2NsdXN0
X2xhdGNoKSkgewogCQkvKiBXZSBtdXN0IGNvbW1pdCBtdHIgaWYgd2UgYXJlIG1vdmluZyB0byB0
aGUgbmV4dAogCQlub24tY2x1c3RlcmVkIGluZGV4IHJlY29yZCwgYmVjYXVzZSB3ZSBjb3VsZCBi
cmVhayB0aGUKCg==

--===============0038911973==
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/mysql-next-\
#   mr-innodb/
# testament_sha1: 1779723ed4652204f3d0b6db9e8eb9df29e3a301
# timestamp: 2010-10-27 10:05:54 +0300
# source_branch: bzr+ssh://bk-internal/bzrroot/server/mysql-next-mr-\
#   merge/
# base_revision_id: marko.makela@stripped\
#   rs6mrlgx3lj1fn6r
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfZFjaAAAj/flEAwUnf/918j
1IC////wBAAIAFAEQ9zbdYiVyVk2CSJKnsJiGBAFNlNDQeoeiZqNqA/SgSpJ6QMyjyg0BoAANAAA
ACSITQAqfkpp6niGmoaae1QaaNDRo0AOYTAJgBMJhNMAAAmTTQMJKEaNJ6aTTJoTGSamT01GQAA9
TQ0GByky5dOXyc58QuvlT31POCnJ4aIRSO7ydJufKwgahmZmWbxR+Ipcz42ZlQRORN152YbDNn28
GrI/OTD7XH75dIIzsE01JRr7tQYT3QOjfFAzIiKxYj2S3J/e/lT0F4oVYrBUkBX8ZTt7MeIHIMbT
hqnoUl1CUeoSmaad2e4YzwrIIuYGY6W1ZeNkKKFUJspDiXWEouBQLRwWciizqRCCtb+gRK4R8DsF
0LED0RoXayF9eOw93GDwtMQrZLYW3vdRmClVQl/lHpAopxnyFxnr1EhgDTaX/sL80Q1bEKFx6aNT
tmimwaC5T1Wz3QrFjlBGvRhm7RGVV1ZBrBkFpfdO4ehb6gfXKEMUNHhCnDSClEsGzRaUPAOLrzBj
EwpGoWUmhBObFI8RrFgOU2YRcbMGdQA5Ub8SVkhail48uAeTjqhOGOAwsAfZKJGebM2ZONFcxwFO
QspCNxQKXeHaEgVwKaUJCn0taT5xUZqKcK5TBptGkSF1ugVmAryL9LC5UDBxmAmuzcIQHxz0Tuoh
MTFZgXKAoy1GJnKapsKiot6Sc7UWSxe5pVCvgpjg02kqUTpa8XwWXs2V5g7t5SD7ec33C2CUiwZm
G+vfyKNAi/lY+y8F3x65HQaqmbPBOjzdkgwGi6zY4VBtMjLd1iUE49UnmQ/w5CVtrUOMRLv/VRe+
StpS8YCWpi9AHOXMXIGzNKebTWMvGicQt1c3H52s3Uk0GaA7Jktopmm8UVgKc2LrRNLnOE1RSyry
q279z2sEqxLZolquxpyLYhrwoCBaBPSjxUtpeRxcBYVxi1qZV45JdSQN2d2QsgaNhtPUdhu1bXHo
JEcLDJo3ZcjabqlHPtbF+XOSSo0Y11VjhhWu2+/P3Ytq1mMSutGmpE0RbS831Ac3CZvUV/DsJLEJ
NOQ3uSczsAtA1gzIwF5HwYqvrO8rRwabCXP+oaLSrROVb0Tb5FJ1vy4pa0SG5FRup9BciyoTXiWF
qNKSf36koIc0QcemJziJNDaqgr4AzDKMfBC3NoJbUdxwTD81ytNkcR6iMVX7geNFrm0GT8CmSGUa
YDYicNwTE7IZU8OjkcSoDDyAExcXLoJUogtzVKcV1q0MGA5ymsozv277gL6FCGIDk1IKMAelDdJU
ZTpKoILPNZn7UbvXVaDCEBNamvgzyBCuGf2qqJiVqSVDEga981TRirhr83ccJ7HroDhkBKBTllYN
GtFgRE0WCd9IG6Qp0K8VYq4tVxCQphbrYCyhS/xh2/8XckU4UJD2RY2g


--===============0038911973==--