From: marko.makela
Date: June 2 2010 11:54am
Subject: bzr push into mysql-trunk-innodb branch (marko.makela:3137 to 3138)
List-Archive: http://lists.mysql.com/commits/109960
Message-Id: <201006021154.o52Bos3L013439@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0545587935=="

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

IDMxMzggTWFya28gTcOka2Vsw6QJMjAxMC0wNi0wMgogICAgICB1dF9zdHJlcnIoKTogSGFuZGxl
IERCX1NVQ0NFU1NfTE9DS0VEX1JFQy4KCiAgICBtb2RpZmllZDoKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS91dC91dDB1dC5jCiAzMTM3IE1hcmtvIE3DpGtlbMOkCTIwMTAtMDYtMDIKICAgICAgTWVy
Z2UgZnJvbSBteXNxbC01LjEtaW5ub2RiOgogICAgICAKICAgICAgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAgICAgIHJldm5vOiAz
NDk1CiAgICAgIGNvbW1pdHRlcjogTWFya28gTcOka2Vsw6QgPG1hcmtvLm1ha2VsYUBvcmFjbGUu
Y29tPgogICAgICBicmFuY2ggbmljazogNS4xLWlubm9kYgogICAgICB0aW1lc3RhbXA6IFdlZCAy
MDEwLTA2LTAyIDEzOjM3OjE0ICswMzAwCiAgICAgIG1lc3NhZ2U6CiAgICAgICAgQnVnIzUzNjc0
OiBJbm5vREI6IEVycm9yOiB1bmxvY2sgcm93IGNvdWxkIG5vdCBmaW5kIGEgNCBtb2RlIGxvY2sg
b24gdGhlIHJlY29yZAogICAgICAKICAgICAgICBJbiBzZW1pLWNvbnNpc3RlbnQgcmVhZCwgb25s
eSB1bmxvY2sgZnJlc2hseSBsb2NrZWQgbm9uLW1hdGNoaW5nIHJlY29yZHMuCiAgICAgIAogICAg
ICAgIGxvY2tfcmVjX2xvY2tfZmFzdCgpOiBSZXR1cm4gTE9DS19SRUNfU1VDQ0VTUywKICAgICAg
ICBMT0NLX1JFQ19TVUNDRVNTX0NSRUFURUQsIG9yIExPQ0tfUkVDX0ZBSUwgaW5zdGVhZCBvZiBU
UlVFL0ZBTFNFLgogICAgICAKICAgICAgICBlbnVtIGRiX2VycjogQWRkIERCX1NVQ0NFU1NfTE9D
S0VEX1JFQyBmb3IgaW5kaWNhdGluZyBhIHN1Y2Nlc3NmdWwKICAgICAgICBvcGVyYXRpb24gd2hl
cmUgYSByZWNvcmQgbG9jayB3YXMgY3JlYXRlZC4KICAgICAgCiAgICAgICAgbG9ja19zZWNfcmVj
X3JlYWRfY2hlY2tfYW5kX2xvY2soKSwKICAgICAgICBsb2NrX2NsdXN0X3JlY19yZWFkX2NoZWNr
X2FuZF9sb2NrKCksIGxvY2tfcmVjX2VucXVldWVfd2FpdGluZygpLAogICAgICAgIGxvY2tfcmVj
X2xvY2tfc2xvdygpLCBsb2NrX3JlY19sb2NrKCksIHJvd19pbnNfc2V0X3NoYXJlZF9yZWNfbG9j
aygpLAogICAgICAgIHJvd19pbnNfc2V0X2V4Y2x1c2l2ZV9yZWNfbG9jaygpLCBzZWxfc2V0X3Jl
Y19sb2NrKCksCiAgICAgICAgcm93X3NlbF9nZXRfY2x1c3RfcmVjX2Zvcl9teXNxbCgpOiBSZXR1
cm4gREJfU1VDQ0VTU19MT0NLRURfUkVDIGlmIGEKICAgICAgICBuZXcgcmVjb3JkIGxvY2sgd2Fz
IGNyZWF0ZWQuIEFkanVzdCBjYWxsZXJzLgogICAgICAKICAgICAgICByb3dfdW5sb2NrX2Zvcl9t
eXNxbCgpOiBDb3JyZWN0IHRoZSBmdW5jdGlvbiBkb2N1bWVudGF0aW9uLgogICAgICAKICAgICAg
ICByb3dfcHJlYnVpbHRfdDo6bmV3X3JlY19sb2NrczogQ29ycmVjdCB0aGUgZG9jdW1lbnRhdGlv
bi4KCiAgICBhZGRlZDoKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvci9pbm5vZGJfYnVn
NTM2NzQucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvc3VpdGUvaW5ub2RiL3QvaW5ub2RiX2J1ZzUz
Njc0LW1hc3Rlci5vcHQKICAgICAgbXlzcWwtdGVzdC9zdWl0ZS9pbm5vZGIvdC9pbm5vZGJfYnVn
NTM2NzQudGVzdAogICAgbW9kaWZpZWQ6CiAgICAgIHN0b3JhZ2UvaW5ub2Jhc2UvaW5jbHVkZS9k
YjBlcnIuaAogICAgICBzdG9yYWdlL2lubm9iYXNlL2luY2x1ZGUvbG9jazBsb2NrLmgKICAgICAg
c3RvcmFnZS9pbm5vYmFzZS9pbmNsdWRlL3JvdzBteXNxbC5oCiAgICAgIHN0b3JhZ2UvaW5ub2Jh
c2UvbG9jay9sb2NrMGxvY2suYwogICAgICBzdG9yYWdlL2lubm9iYXNlL3Jvdy9yb3cwaW5zLmMK
ICAgICAgc3RvcmFnZS9pbm5vYmFzZS9yb3cvcm93MG15c3FsLmMKICAgICAgc3RvcmFnZS9pbm5v
YmFzZS9yb3cvcm93MHNlbC5jCj09PSBtb2RpZmllZCBmaWxlICdzdG9yYWdlL2lubm9iYXNlL3V0
L3V0MHV0LmMnCi0tLSBhL3N0b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwdXQuYwlyZXZpZDptYXJrby5t
YWtlbGFAb3JhY2xlLmNvbS0yMDEwMDYwMjExMzczMy1mc2xmdjczbmhpMGQxN3Q0CisrKyBiL3N0
b3JhZ2UvaW5ub2Jhc2UvdXQvdXQwdXQuYwlyZXZpZDptYXJrby5tYWtlbGFAb3JhY2xlLmNvbS0y
MDEwMDYwMjExNTIxMS15M3VkdXgxcW1ydWxzeGNjCkBAIC02MzcsNiArNjM3LDggQEAgdXRfc3Ry
ZXJyKAogCXN3aXRjaCAobnVtKSB7CiAJY2FzZSBEQl9TVUNDRVNTOgogCQlyZXR1cm4oIlN1Y2Nl
c3MiKTsKKwljYXNlIERCX1NVQ0NFU1NfTE9DS0VEX1JFQzoKKwkJcmV0dXJuKCJTdWNjZXNzLCBy
ZWNvcmQgbG9jayBjcmVhdGVkIik7CiAJY2FzZSBEQl9FUlJPUjoKIAkJcmV0dXJuKCJHZW5lcmlj
IGVycm9yIik7CiAJY2FzZSBEQl9JTlRFUlJVUFRFRDoKCg==

--===============0545587935==
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: 037f201b36f7343d7d99f3e2f556d853e9d1be56
# timestamp: 2010-06-02 14:54:20 +0300
# source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/
# base_revision_id: marko.makela@stripped\
#   fslfv73nhi0d17t4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeMFzEEAAYTflAAwUmf//19O
mgC/7/9wBAAIAFADZ52xj3cidQEoiVP1P1NplT1T8mGqn6pvU9U3lID1GNRvVA2o9IOYBNMAmQwA
BMEwAAASSCYg1GI1T0h6nlDaRo2kGgDQaBKiajGoaAaBoaDIANAMINASSTIGmiaMmg1T9TSHpA02
oBoaZAUW2PTK9duCVz2GFVsALpmSwi1jq6aVVTb6n7mnVqlDWC+fEts2avP7EfJclCz0lUWRdqDe
tgeMEcb4deDo8u8PBBENwUBrUbM/ztfgLFoTrIR27xGWGuuNEoKLDMzMg1l3WgrB+iBmeGpBMQ5O
ZMmmOpTuh1BkrkStiK9jdNBw7K4b/ycX4iiXuQQjQKDPhYxP0kPJ0wjXdyVQpThplbJ5FQs3Fhnb
efTmI9uKBVIW9BEpLBgucG/Z0boKalq7E6OodFYYcxp8QtXUVBClchUTl7W026WwzOF5IkWyjT/G
iZA8rOtZltWOk1YrFJ3Uq9gPqC8cEqYINvHNUWGLws23RH1WoJ1nZMgltWhnPEHkp3XKNsuhk7F2
YO0DJZ0jjO8ulR0rb6y1QxHhbEiGV5LOhk+85c6R1M02JVdpSrSyDB5Y5NNoloSjN1FC7mZ9Hj2m
HJz+HHruWAQUaaUJFczojyXyUrlAbmJBkWgZYPQ+qYULEnIrUImZfG5Q7+MyKEg7erUQ89PDgIPc
9oZCHfba88eVaPKkRqYsbX6Hhceqr1hD3GhQdOwGHJYk6oO7tDhZpF8Ao/Ug+aJgb+kiRw4t37Jm
EaxFuXYvrW7LBG+BRSk6YMakDokS4hVQFxRkPe+0TsqUEhzW7TOG9dGOcGt5jPPRjnKK5sN+5zVn
5MPyiFJsip2b+m2aVco3noQ6EZuRPHq7ry02GVjy8JjEif3TXFTt1RuS1IsNwPdQqVkrtpkQj3Jn
5F6cXZhH7UeGzVC8NAzdjgXpsRHlsDBIxCkKXCWOVQhiCqlzxYVKdQjkIyWh2DO261e+pspCB4Cj
ZHRlqkRBnu9C33qY3F6HMmWfFIwgSySJw9Mx4iNAhUucyuxy2sycPjrh6RbL8lIS6RsLrEX9tu+J
TjJIosKQrYR1CinLhB7nTu3MU2g0ji2xTVgRY3CpVbmFzT39pCroXZE36/FcTC1Mzk9y117sd4sp
IKV8F1pjpwoLSiqsAt2CYTlerBY6yH+M+7/i7kinChIcYLmIIA==


--===============0545587935==--