# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100511153919-hjw6khgh4my3fio0 # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 018155b4870bc3491f31b2e75f3cec233c0e2b81 # timestamp: 2010-05-11 18:39:28 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100511114422-\ # 4bj3ttf85juwog2j # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdzPe48AAgRfgEAwW2v//3Oj XoC////wUAR48D3MOgGi7VhJU00jFPKaeKbU201Q/VD1BoAADQDTQ5gEwEyMAIxMTCYTBDTE0wGm pomhR4p+qMxT00mgBoAAPJpPUAEkkyapt6qep+qDagDTQA0ADQAaMgSSCCYTAmiaYmBEymwFGhtR oaaKEoc5a66bbDfIO6uOV90UsuezZSYFJDmqmVoAtWJVeYIqATh3jO7KNtSSL/ZMWxiObLBxLmsk /ag/e32rLR6mhzTqgFiY95zPbfjzvaSl7LlDCJNGFldtIhEtVZWdAHGDgOgfD/sTn9n9H0NRgujL 5lWkLeEqRWHNUE3cE88aA0RF2circ8g8na29XoVYckEl5JPvl80SSjEonJ1TPe7Xutrhc+IxMChA FsB8DlEOco7cTS6YJEwRhkmXPprJgvUVcszDmrH6mSLY8qPJz1mYIiGFWWzBJGEKYxp6HtOJvUyZ 5Z8rRPdKOBio3Vl+OSuvsZIaC8ghVmL1VQ4zBH1CIYegDxyQx9pptHOINO7RJSceBS9KMDTCgqrQ 4iwtN4XQpJyElEypUZOYMjHnYpxtWqyBplLDKXpZxfrX0uNeEp3VtSMnFhtC5iLFcosYWjLwdMoV VybttxO0g4kM5OYW0mwLs5ClTlwfhKWkIFmy1w8L7iszDFCixplpyleE+hYkQpoTGaZwUm85Vm+O 28JhZ2vE7VQShbSQvp4XVd/S27z8rNee691j1tsWCjKYBGEkDzoiMwxw9zBhcWNmi/BzrpxsYecR zHH5nV3vi4kexaRTnGklCE1wiBILoXLrwLkTVh+Rj7xZCxzW9ZTRP/rWdeQ5mBsvaGpp3h4G0OJi eiD34cEKtyVSeHy+qD9rSwijPvnSxJkHAGUmbneHcO8DEwIkDEJDo5VZbvdO7+0NTigMs4e3gFh7 AxaH4lOuVy6njITUIVZGo25/IqMyesh2ZL1CcKfQKDQVhJ+lm3i8GEmX5+xc7bCzDePK8TlQQDlx htoOEPdI+7i5MjbnnOnbqCpbDPeszEjhHZOoYUhu1DjjxHmBMmCQ0lZ/HGomFhreHPlvVfLBkKXI X8ms59hrE2sGqZbhViuWmsqMY+Qomsx31BqCKiGVQVfShaPvrjLOLWEUotQQKm4Z3rEwcniuM0X2 VoN8TgvSHcT4LAsT0Dp0JlN37y6N/AS8EGc07D8k1qpIP661mPrQPCyY5GvxFQSSnWwDyEqIhBnb 44wBpeoN0KUMyGT38Eh4nou+E2SSgI3vR9kLoE652KplqJUbmEZWeiHsHvvVmMoCjTm1TTEXhkJM r3A6AwIuzclaVLdTE1GVTOTmkOrNiNgVkmJQUDBu9oDNatD2JjMHURZJ8i04kwpgrYnfR4naQH65 aM6vFcFTARVYTTM7EWUqHWonV/XVblmPGuVwr0Zx+dWzYoPGh3CkUOCgE2/Tbk04snv1QG6Sd0p1 x5neqXf4u5IpwoSG5nvceA==