From: marko.makela
Date: April 27 2010 1:52pm
Subject: bzr push into mysql-5.1-innodb branch (marko.makela:3423)
List-Archive: http://lists.mysql.com/commits/106676
Message-Id: <201004271352.o3RDHrMB001529@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0358276566=="

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

IDM0MjMgTWFya28gTcOka2Vsw6QJMjAxMC0wNC0yNyBbbWVyZ2VdCiAgICAgIE1lcmdlCgogICAg
YWRkZWQ6CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3IvaW5ub2RiX21pc2MxLnJlc3Vs
dAogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi90L2lubm9kYl9taXNjMS1tYXN0ZXIub3B0
CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX21pc2MxLnRlc3QKICAgIG1v
ZGlmaWVkOgogICAgICBteXNxbC10ZXN0L3N1aXRlL2lubm9kYi9yL2lubm9kYi5yZXN1bHQKICAg
ICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGIudGVzdAo9PT0gbW9kaWZpZWQgZmls
ZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2UuYycKLS0tIGEvc3RvcmFnZS9p
bm5vZGJfcGx1Z2luL3Jvdy9yb3cwbWVyZ2UuYwkyMDEwLTAyLTI0IDA4OjU2OjQzICswMDAwCisr
KyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9yb3cvcm93MG1lcmdlLmMJMjAxMC0wNC0yNyAxMzo0
NzozOCArMDAwMApAQCAtMjA3MCw3ICsyMDcwLDcgQEAgcm93X21lcmdlX2Ryb3BfdGVtcF9pbmRl
eGVzKHZvaWQpCiAJCWZpZWxkID0gcmVjX2dldF9udGhfZmllbGRfb2xkKHJlYywgRElDVF9TWVNf
SU5ERVhFU19OQU1FX0ZJRUxELAogCQkJCQkgICAgICAmbGVuKTsKIAkJaWYgKGxlbiA9PSBVTklW
X1NRTF9OVUxMIHx8IGxlbiA9PSAwCi0JCSAgICB8fCBtYWNoX3JlYWRfZnJvbV8xKGZpZWxkKSAh
PSAodWxpbnQpIFRFTVBfSU5ERVhfUFJFRklYKSB7CisJCSAgICB8fCAoY2hhcikgKmZpZWxkICE9
IFRFTVBfSU5ERVhfUFJFRklYKSB7CiAJCQljb250aW51ZTsKIAkJfQogCgo=

--===============0358276566==
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/mysql/5.1-innodb/
# testament_sha1: 167f2d41b1a3ae3e64185e58ac5778ade3fc7907
# timestamp: 2010-04-27 16:52:28 +0300
# base_revision_id: vasil.dimov@stripped\
#   lx9k0a424krqj73b
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWREdlAAAAs/fgEAwe3P//1cj
VEC////8UAVYeAARAAABzAJgJkYARiYmEwmCGmJpgcwCYCZGAEYmJhMJghpiaYCU1GoU9TJso9J6
aNQaAAyAA00PUAcwCYCZGAEYmJhMJghpiaYBUpACaAmJpoRhMFJ5BHkRpp6jRmpQO702VG3+o9bD
0OvJNKNOyGvCa1Xq6IyNagJIKBfnl1IUtT2ZT+wYKw17ySbR5h8xeYNaAiEEkqzh4/Hwn+b4/6aa
AqREVyNAgSGqxdNOi3GZSBYfkCZGVb9u7jYZ3tNkcA5QhcXjIXHmTmEdFFmnM+EMh6S+HcykOosL
Vpc8XCf8aezwscsMNPgJvmCF+wx77qqvmjhmvpfJ21KqPdqVKm2IpIe8qlW+yI/IuO7L5y+YMVG+
U98rcmbyevBqMX8nfNw6KUp82TfIWSp6s61h0LFOFOjU4S9wiU9p9Mf0bmSqhhP0fKmW3w629Vfp
lhoezYqcibdF2uyIpolf0LW3Zt7GgS9t7HA3dM0J3wvTP85NzqaXWzNDVbnVrw0rLpnK2CtnsqzX
SKKGDpM2xlI1FJVL2k0sSxRqXMZbMFAvusaJokdbNhd/PKYq3Iqqb4a5/C5nTob6Kpun0Vaeq5xp
uTnqimtxxeh0ltIwXFxgqK3hD1LtN7olcyrrUTOaNPM3adbnOZxmJweD2moOzbU4pU/RZfCn8TQ6
4ww5lKNa2NbQxUVNLVhSkNkWu0r1OHFqa82lk7ZUzuMV0vqVnE7rFz4lqVM8Vs9JbD55bWHltlep
jsKTbFmEyS7HUcibohFNfkGwJmOATHo5SVX0pwflERcxIIpsvOkZzMRJCAPKORHNcq3GOZkw1MiE
CS9viF318STs33dyD0GP6l0fcw80faktrGgLagN0RazPLaUvzsTtPhN75St839UPtj4xGzUVJ+yH
57ZsWRrd9GKOTBDwn5VR+XxrOD5PZR6li1W4ND75z8X0n3/clGRm9zm0vzfg5tJUadZuZGT8X2tW
sXb9H1ysnbapEUboix4btbfvYmxXHJW6GiR9WLWarvonObJXD5YaT37ftKJGa3dwe6qvKFbewref
fKzHqeSleconwtY2tbVqeU+pHL56bOhKQ79tjbPSnr1Dc/xTM3rkuaINGRY3ys+5vblx3N9qnF3P
b2yWplL17ZKp9v+eXnL51PfXGbzcDzKUS10n7vQ8u4qbn9JS5KGik84bDnjDSzcHpI6LjlN7TLIs
LJv8kvz4PT25LF7RBnOMHerw+s1zhN3TP/OtDanEjlPFymmKpCrKIofHCjta1rpncdkR8UNbw979
lRSpRU2xpmE3WuxsOTNVN2Cmieay1zo9YeMPOVxPfObRGEnXDxhcrsdLrrdr3KtslKQolXi2/CpC
51WT7oe6SMIPFaj/sRimUX1Jr6i6TB4qVyzg7HY7I2LpcPWGe/BgUf2fjNU3OU6TRInGO6WIyerd
mpJXMEuuIwjhX17B+sfD9e2ZGNDGpN9aVlFOZ1VuJVNM1TnBVfGa8touFXOtj96ey0t/BaoyycF7
A18yw78Uyk00LaRrVHG73q78rMptyVZJm/BugxtTufJV6F8ujS3KKKNTYUcNzirc3bi4OP8fv/8X
ckU4UJARHZQA


--===============0358276566==--