# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100512062146-mkmcuocfya2ccpmz # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 583ef20ae10e76b1c418907740533473f4ea7710 # timestamp: 2010-05-12 09:22:01 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: sunny.bains@oracle.com-20100512023359-\ # 1kycbqgcpp3zolfx # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbZVKskAAgHfgGAwW3v//1cC AIC////4UARs9s1Obp297dTr3koSiIU9E8FPTTCmymNMgEMjIAGgkpNJ6m0MiZRtNGoNNB6gAGgA BJEEAmmTRpMiPSZDaT1Bpk00AyDapIGmgxGgDEABoAAABJQJpMGqn4mmk8RR6QeU2oNqMj1BkDkj jBUdRQgZil6ZKqctgvp0N9mTBC/9S4Fzd8CSCo+sVbkIoMeE4O7NsQQNjAd15VOe4yvZmXlZ4LVK rR3c0ShradmuqifmSzGNJo49/p5ZEDDXCohU/5plV5W/ymWbuvw7RjDffdLhtzP9wd66mZ3IG5dj gO4LXeRSfw8z8mZEc3TNiZ4rb2unE7MSTckehBJ0kH3UhfVKboTrOQmdlql7RgvagOpI6NRXKX2R UUzSex346H4yQmQulOOEV4YE9OTgp9dCrgKrG28sI0nbQWLgqVBlL5l21gUjlzaegrGQVTxFIRZM Oy0tcUnkfbV1KBayk6qNhhu+U2sHW844q3O6cIxYE0BGSdFYoH3BorQ1yHd8MHDSakGmSYGHVK4D nK2eixhQ5Qe0zT51VCyxWGQwwLTQkb8VKa2g1CeV7HCtIVkh40eXKJUflsYwpkLiXTbLQbbrDKCz 3GD9WTEYyNzVXOm7hYiyHDSJ7NEgnxbcp1Itd8M4yF5TQutz4mZTVwUiRcbabJPcsM1NbycZZD2R pCBpmtSlIiyuN2sjUQ459Hnbl3y8LJ5cZGNrnUoR2ooBR7q8JInBrGCjeZkwvYxzmzLIpMYtrflI djhxOXZCTk4PDUZdARTJXyTDfruwjQk6qxehYWjs6MYB1wjd9NMTa1MQiLAwQw5JHfGOIlXSmhtX RI+MicgFm2hL6E4lx0u2osZeWkgPGxNownS8jjgSvu3GHOgo6kJqKWmtHh4jHxtYUN/VpQ0opGlB KTEDHUFVOo6EtXUW1uWFRpKVKmZUoqsqX9W5BMvavSfs/LbaEiS3zFgrmEpeg1UDSjIaWwIoX1H9 C/o1JaPHAbs4oJHE4laKi+55d3RDVkFxj6jCZEzb6xFaDEK1GA9c28WBMTodg2E9rsxjiYkylM2y xKxLtfNKQ0oqhBf7mYu3Ur0gyxhrB+dRSY7i2wURxjkDlj2hM1h0Z5sLKFgoaPjegqMEHA3vzZsN bP2VpEgnFsQu1UGg4NArLiBkjFoKEdeNPt/pwGsFUV6wua3DICJDqhxW1s269dheKRsoGWHhjSch UToHHzn1BBCh1lHpKd0d8Uy4cFH3SVqGZDKKhbsPNkjTKsTLb1JvUAToGtS+RLEKU+S9g+GaZKc2 TKZOzLDDBUOHBVWJr5Fme8Z54KBZPouCAgcGTbqsdlSpbiyDE1mQU5oVazr8ZctQeiOvpsK2K3B1 W0BtqfJeO6TFxvQN30K3mKEUBBl28sr66NHgUEyHeHrm49GBB9BtH206yVTBQFTCVitJDnv9Z5Zl UJlb1C5oiKWx27DsomWMJhr2Stxa1M7SF71ncMws6jmjzm9Wwq2/8XckU4UJC2VSrJA=