# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101202085527-b5hl98kr9wrw5rm4 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: a4770f82171616f8d3c06ef5884a3deb7b92415a # timestamp: 2010-12-02 10:55:50 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20101202083645-\ # ygu8o5txhkelmuph # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfrKZDcAAvdflAAwWn///3/3 XzC////wBAAIAGAGR18AAE1qKSJayASRJNqYIDUaT2mo00aTxIGmRoMTTAmjIHGTJoxDE0wEDAmm CMExNNNABhDjJk0YhiaYCBgTTBGCYmmmgAwgxImp6kZpNPU9JiMnqaAA0ZDIaBkAZA4yZNGIYmmA gYE0wRgmJppoAMIJJCaaGgEyEwU9IwInqTCeTUwjAAQuuOwXxVGTMZRN2c/SbhlmsyuqYSVtVIkV MLvsnzOFtwu02wIQrsqz24Yw6+kl05sl5hmS7dxB4yFJccyep9VBOYTvYvTmg4JKp+iWpn0ZXANN PdF35jGl9206eUv7iQ5dkIEb77l622ouSs12oaDkSfF5Wyy+C0yB5TuYPS7vbZL9rKpxnXTy0KHH b34id4uCo2qk1a73PZXnvcf4nGR5JtOVfMfObDcJ+8c58YSgUraCLdy4+S8ggrjE9ygg/c9q9ZBR 7vVslzaK1Ei4NjY5sewQdH23Sc6yAZTHIZhmdPzH4uZAuqckFDaKAB2fS8oXcgsvV8kBV7lWeweM hkeNltBWUFHtX8rVYisZB5kgRlZ6zeFuRFe6uBQQT2BGBUOq010Kc16fwhj0JkH7svqXdl6eEtrB NlncavhxypXE1WPM5AipIIAEc6dpagyMqCNEwegqNroPcxNZuFp8G+CJwlffPjbQZwtZmkG0dwIo K8VqxYQcMmB6YnrO3irrYkB5Rt5lTYBoMqZzxJzVlrFu6m+DWBYqwvWc88KYwwTljuU1X2FuGEkW ONmhx4Lh8qrDbVEUjdCutfAm8YDdtGHXqC3Bag7QqQdy0hTbbkWTmV1QYepcKXlys0zszMwiQXOL 0HlevXPJMhYNdczbhyJ2kKpLN8enFV2QjBOMStGzBnSggsda2irHcEzzVpX3YIGZPrHA5A0ww8oF tw3QqlKF4f0nlpioo44ouk2NdStCbBhf6gnZEcilhpFg+RkNEvApHqgchikahSFTIY2KAZeh9bG3 3pl/r0+XIaNow+9yF3gOPYVr0tBMmF3YsPPQOzMmZoBQjv6ocfmnh3efbQqGl8e/xCTooxrlY/ah 44p15PW1Uo44TJw6JaFWEgpc5gZClL+IVmEbD6BsFdl9UOsbYQLdXoxYWf3aVycvsJuUQb39pq68 IkZjmmJ4lwTz1iD5/W2ltBpDf3o68DeViCn7D0B+9MF1z+vB6z3jZ/WG896lic+Mx+A1hrP5IzSO yZyzUkMp199FOIz9CKzSg09i+nB6+ytfbr477e8zLN7Jww4SHqf3iRvHA/EZjo0SQ7HAcbvEdmQi VBoUo5RrqQRNsgngpc1B+qzxsKl3rYF9RV13ni6l1/3wO/bCilP8FBJHCmClcM+3JngWz7PXZcGK h6qBVUEmXQXtXDuyz8BVGvJLvu5RYc+zfuKWKcnHabN+Rx1kMMRy/geHcIIsjgg29dV2CZHDGi/l yHQ8+NW4lcWhYpgWA89a3MWrPob9juDORz52ycUZlFTrdu241rpX44qjAxvsr5FxxoBEvLbxASRV D+CxLMLcVbBYXpnguxcIZtiDQbSBlfUU5aGXgDerM6HmYBm4q52HqVb1EM3Jm7d9If1IOSIfUvAU tMTwzJGKd8naciRfkA0r8UungX4tK3jExTI72Pag0EGxfycBdgI8gs/bqEuoF6VA44IGKAYSN2Oq D+3AJDj3nJcRGksHJllmE12ooT6UEpwCQwsYOOuEQby/J2DODDvoIowca6Eb/Y0i4OpcOqYGIJ6f iqIvpYoZimy+iBQyHwgHmZmJkCDMyVoIPKHajDXAUHviQEiEC7t7z+/Cp4g6p2KTLsx9Fd4DyCQn 2oPM0qfRFeK/cSLwsCNDivU4uaoJ+rJAlsGZDrk1TEqkCl+2JDMo2WsKZWA7glxE9yTG4HPQajAp TW8oI1hQivbYU4KqTFMVqDhcKDd81PKUdhAuQf9vwy1ZmMbbg4TShavmYbv43hRWlUZ/I4vsnaoE Cp7fQNmpp5eYmwY3jK5iwdMvB/bRYK1KhRci8u1VO1aXLiLuXxMN3JXKvqsa9Nk+hYGwG2JUZpWX UdiC4IB8Q1XdcqguMZC5qh8FbIxQSP/A4+J/8XckU4UJD6ymQ3A=