# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110517121555-lmple24qzxqkzep4 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 963fcc52ebab9e4b9f73601fa46a3b13f81e1cbb # timestamp: 2011-05-17 15:16:01 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110510125053-\ # spvv8avw8hkhdwrq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXQLoVkAAavflCAwWmP//38m FIC/7//0BAAIAFAEDd2qSTmhMksJJIEGQ9EyaZNNFP0SY2qABo9Q009QJJINGIBGJAR6MmoAaABo 0AkiE0EyMmk9TSe0pk9I9Rk0AyaAD1BCo0xNPSYhkwhpowmmIGBNGAmhzTEwEaYEYRgAAACYRhBA ffSz7Tb9oD2PryUqer3zCHQusskg625fKhU9fnLnrn3sM1XgWxnDhhGLuurlTuOFHhuhqoZvDBu+ ZFjx/kuMp7MD+aYCbo/FBYYTwTWuFar1SQhlyCoFCgmhqaFV1Bru8Z0GwBBIeSiEAmh293gwm3Ta rlrSZKKQyv7QN2NknzLYy4thUI8iiFTdRjCCC5X85UuyMqGZMuY1v51ipaSyl1vcuNQjl1VmE0hD pnLC4Xs7J05sH6Stt2KvNseF04vepi7vVhsLMh0xsfK2L8doh5CkMzWmsThVSdezao20PDb3t3or MjqHjhupyq6Gk8vhzz4deRU+Rkn5aKUKa6udGd0ja0KgdOVOLejGi0nLkPfNSOLRy1TX7Ly93Fp6 KBYtFab2W9hODKGRmt80tQpxxpU8XTvMi6uxMZvObsaNk1XWtC10jiZUdNnPMYllcowZRysLbGCO ixvLU8hVHxT8T+LbZcsNJpLlnIfZtr0ntK+LO2pzVcztcWpuITFDkz2oKgfU0lOoe4z3rlfqWvxg xQvN15Zhes80yU/GzSwzN9G6ZdkqkQ/UnKO7XPuMC7hGTRYOr4TkFf75yIbnTb7yoDl2dqRaTtgG JaB7Xv15ZJ7ZUeeYDGPYpFMol4ncqOmyFcvCOF2EMPerel8Vx4+p5jgDGlZjJnlxUMoQ3lKkTdjh DczJHOZIvcF9PWU1mG+63FizKCoIVKahdyhonIys0Wp5Sg1rBGaAo7g4te3xdaDAuzC+nDNDpfd4 cqtrTum36NAPfBvI8Kt87P3X6JG1dXFYH9bTqPWmVQqQe51JcysrJAiTrsiexQbrjhgVqK841nPU HopEx8OfnndMXF7jmd8AxoRt5MMwXqxSdO3RQxomXKAv2DaLJ01Ue4OVQopgMSgoWzELbK5yLevT Y+BYmGbhwDsvolrsTdOQH5gswyQS8wngtQkEnBMyBiKQ3ETf3J7te+Ip1UYFfERNu0DLvOAz9GK0 wsNtXAgpSLhSjwJQueEEwy3wJBBlhqXKCzCZ5ebdVoKgZUjJln5EEEGJkS1BPA9DTn4SN4QXS5Z3 VhFdiL3Xit1ZlMPYUKZ+tWrwFl6hRDmZRSXpujwpRLbqKts6EFaxI35qaJSWDro21SlRRbAJWEM2 0Fo0JKsIVmTSVFnKkT1Iyhda9sMojNBDwCys2sE9VcBiYaAVInUzlfcZ/A5+L1EJRsrY8dyOSeqr lctYfqxULIrTKiZa4uIsqlpYx8o5OImkqF6dv8bOv/F3JFOFCQdAuhWQ