From: marko.makela
Date: October 21 2010 7:37am
Subject: bzr push into mysql-5.5-innodb branch (marko.makela:3193 to 3194)
List-Archive: http://lists.mysql.com/commits/121451
Message-Id: <201010210737.o9L7Qkcu020726@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0288441997=="

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

IDMxOTQgTWFya28gTcOka2Vsw6QJMjAxMC0xMC0yMQogICAgICBsb2NrX3JlY192YWxpZGF0ZV9w
YWdlKCk6IERpc2FibGUgdGhlIGRlYnVnIHByaW50b3V0LgogICAgICBJdCBpcyBmaWxsaW5nIHRo
ZSBlcnJvciBsb2cgd2hlbiB0ZXN0aW5nIHRoZSBkZWJ1ZyB2ZXJzaW9uIG9mIHRoZSBzZXJ2ZXIu
CiAgICAgIFRoZSBwcmludG91dCBvbmx5IHNlZW1zIHRvIGJlIHVzZWZ1bCB3aGVuIGRlYnVnZ2lu
ZyBhIGNyYXNoLCBub3Qgd2hlbgogICAgICB0ZXN0aW5nIGFuIGluc3RydW1lbnRlZCB2ZXJzaW9u
IG9mIHRoZSBzZXJ2ZXIuCgogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvbG9j
ay9sb2NrMGxvY2suYwogMzE5MyBKaW1teSBZYW5nCTIwMTAtMTAtMjAgW21lcmdlXQogICAgICBO
dWxsIG1lcmdlIGZyb20gbXlzcWwtNS4xLWlubm9kYiB0byBteXNxbC01LjUtaW5ub2RiCgo9PT0g
bW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vYmFzZS9sb2NrL2xvY2swbG9jay5jJwotLS0gYS9z
dG9yYWdlL2lubm9iYXNlL2xvY2svbG9jazBsb2NrLmMJcmV2aWQ6amltbXkueWFuZ0BvcmFjbGUu
Y29tLTIwMTAxMDIxMDMwNzQyLXFlNmttZXhsdnVpMmV5MGkKKysrIGIvc3RvcmFnZS9pbm5vYmFz
ZS9sb2NrL2xvY2swbG9jay5jCXJldmlkOm1hcmtvLm1ha2VsYUBvcmFjbGUuY29tLTIwMTAxMDIx
MDczMjQxLXV0ZjA0bGNqdTUzc3M4NzEKQEAgLTQ4NTksMTEgKzQ4NTksMTEgQEAgbG9vcDoKIAkJ
CXV0X2EocmVjKTsKIAkJCW9mZnNldHMgPSByZWNfZ2V0X29mZnNldHMocmVjLCBpbmRleCwgb2Zm
c2V0cywKIAkJCQkJCSAgVUxJTlRfVU5ERUZJTkVELCAmaGVhcCk7Ci0KKyNpZiAwCiAJCQlmcHJp
bnRmKHN0ZGVyciwKIAkJCQkiVmFsaWRhdGluZyAlbHUgJWx1XG4iLAogCQkJCSh1bG9uZykgc3Bh
Y2UsICh1bG9uZykgcGFnZV9ubyk7Ci0KKyNlbmRpZgogCQkJbG9ja19tdXRleF9leGl0X2tlcm5l
bCgpOwogCiAJCQkvKiBJZiB0aGlzIHRocmVhZCBpcyBob2xkaW5nIHRoZSBmaWxlIHNwYWNlCgo=

--===============0288441997==
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: 979c2ea28edc502ab8be7db1872eee4f0fad5a02
# timestamp: 2010-10-21 10:37:28 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: jimmy.yang@stripped\
#   qe6kmexlvui2ey0i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdTu4ioAAajflAAQWmf/91ci
BAC////wBAAIAFAD1vAGg6oAhoiTTI0aaZkEGyjIAADQA0QptR6mnoYkA0AABoAAGqaeUI09CBiD
EDRoZpBoZNNMYAAAAAAAAAABJIIaAAQ0mmQNBR6QY1HoRXtnpRTINDggCDTmDCAfFFOo0InpTK2O
QzMqm4Dspd1wkICTMiujzKCOqg4gfPH7uxjrf3GDM8KVxgIMkFzEBU99Mvs/DcW5aYeiHMtiKK+m
/w+uK+4j7L2CZbs/CjmtsBR45vnwWCRvm5JSU+Vj5/aAEWbnfcIeg4JkJ22ooigYMLwT3PeeA9hl
VB3qrVkoloVUOTxwnu7pCLmQWqIwvGWh3Pg58ydO7Dpmy9zH4ltrf9FI7T05TaFRYyeOygtdRlwE
b80EYbqdhXQ3kIzK14Y+7e6MqWxwVcmsuuXeWix1g7tNFrKZWhQYdmmtxOKfUwYmE0k12VDHGbDJ
DTk2hW/emqyrFXjljpZsv9E2mldSf839pEJBphfemNdJ6rLIzHBPLJy6hVI1UsaUSGtHWphTjBPc
rZ9C6621TTlMVTqtyfVXIWFkpxDYClew6scjI62eYmODmpJkFTxPgloWEjfBjUKNLpq2jemvxgTO
TUNEkFEmkoepn57tSp3V/Pv9LVy/ZcErKUzN/dr50Q7oOujayPTp0idKNxAN+i3LiVckv1X69UiP
Y+EA4JcPPPLGb2W1KPilKNLjm3XeszsdgrJ3V9mS9eSGKFwPFeHop/NNWvXhtyFd+6B7OSLUi+fG
kw5Wd5fXpfeqFOOiF3st1iw7ldR2mVNPgtGTa9XAo3BMaYfZUKqpiuVGiCABySGYsz1LrL6q4zVl
E7sUhv9EDSANgvrga9U5MZ78rucTteZyJiQOTlenQO0qURZ+QTXKT6xQA1ggHaqQYzF2c0jQYPCg
mAktlbvNAEpWMU/lWhZApXEs9PwvN2yn497F2wQPyobvIL9Ziuua4++2krRTfPkHjCqdbAaphHYl
87w8VeBt07ArCtyR7Ch1rSHFczZPl+FzTH3x1l+lnd5JH0S+CQ0uOiwuhf0TbVOCaJXFNBoRHMF7
4BCDkPXbJQhdO6cTJky8KujJZCJ7aB+4FQL3hFfKRIKV9HKmxxgUc8nMnkZ8IkbcVNlkHwz0lymr
mRRypKI1kwElbCGMwRiDhyzv5ii90acLHFbjCx9ZIH0nVv3FUEgzaX6svi6DuZez305YLagTkTSw
rKiLBSJnqD1hn6ix+29ea4kgqrsN4v6dwvvVBObwzTk4T3tsmeWcplrDn4PWfxdyRThQkNTu4io=


--===============0288441997==--