From: vasil.dimov Date: October 19 2010 11:42am Subject: bzr commit into mysql-trunk-innodb branch (vasil.dimov:3257) List-Archive: http://lists.mysql.com/commits/121115 Message-Id: <20101019114221.A73152E0AC@mail.v5d.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8890479479507411398==" --===============8890479479507411398== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:vasil.dimov@stripped 3257 Vasil Dimov 2010-10-19 [merge] Merge mysql-trunk-bugfixing -> mysql-trunk-innodb --===============8890479479507411398== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/vasil.dimov@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vasil.dimov@stripped # target_branch: file:///usr/local/devel/bzrroot/server/mysql-trunk-\ # innodb/ # testament_sha1: 9525c3197c4db554e385afda447561e1388fd3e7 # timestamp: 2010-10-19 14:42:21 +0300 # source_branch: bzr+ssh://bk/bzrroot/server/mysql-trunk-innodb/ # base_revision_id: vasil.dimov@stripped\ # 9n11quv2ofcjeayh # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRyeJIAAAvlfgAAQUGP/93YD AQC////wUAWV46622zWO6mzAAAShQp6ekI9NGp+k8pNHk1PTU9RoNNDQSkCMCaAJBoAAAABJJkmk 1P1MiMQyPUANGg0ADAADQABk0AAAaARSU9EwINNGQRo0nok9EeoGyhcIaB5+JgXGF6lvDPF06qQT o0jAaWMVFgx0dyu3AvKhRRTlkhzlJzUKMMKTdMq+bHx/Dclj9Uk6iG3dlmfBgbTXl01ZjOcgPGCL cRoLA2KNw0BU6cXgJq4GRMqHx/k4moamjdZNwEbBkJZZkreX3VaqpznfSJBEIF4w675C6FGETw1i yIh1qnVooJnpYg65hx7+k4BXZEGRGUY7qFVUmeuwa9gnc00vv1KxdjCjZAlR24B21mg4NSBMRxYX 7Je4SlCmMaKWXpPQmIwSuHwXmqIwt1Z7Baxt58uWAlBTBrPsUHl9BFGFY4/Ik3oXdCRrBRJAGhUX NApioJZ9OcfW0zGi2XJ7cJpWJmWdKMCD71y1WjoJVGGfCIMSVN1rq3jDfwPLo0NR8HzHBJiUX53D EDaJZLDI0GW3hTsCjGNAbgvC9jSXGXTUpbeYZmhqTEwpiqYpwwcvEQpQFviGAuY+tzH27D6BBwjC 7GLC5FW1zKq6DnVjbK7POa8Wk2zIIVqY2k8gk4wblOjUtsMhknioyoXjjpqE5BaTPLn1EiH/bdd+ GgOCyDfQY6BI1rE3hzBBtKMsfLNTchxmbXYtfot6KQIMs1J4ppDZxcFeqIvCCd18zBTfQolgSRxD VZBnNI5A0ziqOFk6ECYcawLUp2jDg6x2gxiajIdmZOMSbkNxn7zUrBLXiIlsLi9mTIbfg8SaeBBJ gP26UHvFkAgaSw2uQgow83WHWfQYYCCOQfqNCyyc94cjmRJPj04uYnEtO4BnsEu/WoSSQEqTi+8u PDAfNMSDNCWbJF8paM7nWF6RLxLTOV5jXxDtMn3iC/W+eFtR4HjpbJECPsi4ED7jUG/D0PvOCstS gYMnQO0/FPCVWBkdyCwA28/MMBO8AvNwivVtPQ4ZAliSq8Zh3ZuiMSdRWmQRuJBhoCmIrUDkRsRK OG0PZO/hF+91Rp2MdrtZTvEiZrtY8Usr9yQLqQxEUTYJoQCMCPS+0tJQ4iWATdwBUPASknvHRx++ Bv2+WE5mTIenXswdExDT+TyP3PNwk/sRBIzLkJe7cezHQDpVpyG5MOZEegXl5WfIwUGQXKbx0B+p iYVgHot/w2H+bXI3FJqA7D3A9D0ZOD3pKb+IcBg8h1ZLuwHUdYPpSQkuYF4F5JCZaIwUMEHzarzG MTqBWWj2FfxnsSruJBtmag1ExKjQpI9mgOQ1nj/E5RHy1FYflgkrBnQWk1gAmBILzAZHI2q5iaAg YHwy86Tb7sc1XSB1JDocBGpa03yHXQ5KfVysk3cCCBkFJ5vX/ncN2+oqGlTYPRqas4AMRhuQD4KB wpEtPI2BU8/UApsTMryp3GhqKZDA8hlgTLw6RFRaptAkaS+CIOvupWFYGuvidh5D9mZM7hsILjeF RSbvEuDUPhYto5wG8dMh3lIn9bxLWObyNQ1jd65Cer1CzwG9ZCcXF/s9iJffEbVMXMaG94PwPsHQ TS1AEBA4g4yE3vdTkMtwB1Gpr0nIj/xdyRThQkByeJIA --===============8890479479507411398==--