# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100909105006-fzihgkd7gjx7ac9s # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 40b5db8353a1e7b7b667a933b48cf99c132237d2 # timestamp: 2010-09-09 13:50:15 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100909104800-\ # rr27pzs6rnqvwc29 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcjLiRAAAXVflEAQVmP/91Mi AAC////wBAAIAFADet3dLtvd7nVqb3hKIpk9GU2gmAqPNFPU/UamnoIaHpAkpNQ9Jp4onpmqbRoC AyGjIyGBoSntNEMUAGUDQ0aBoNA0CSQmST0yaj9U0xlGJtTQYgABhJJpKDyeqeU0emjU/SRiPU00 AADUaeoem33C5Ci2VCKOZFzvdBx7t9d2ozPh4l8YmwRETlm4wfZ69/OSSUVBk9+Bu3Nt1Riiex+h pw4l/1X2Piv3EJIm00NGCz21rXE01rKye7eSOUNAiqh9DmoswKaKbgEwh2CRlH4F9L0ERwoNPfRS QQQQSwcSiyYlCpbrG8PCzBO6WIhbIgLNugXuNFEoJSYnxLgKv0nfs4HodtcbyCjsNd90bcEQ88aS BCrlnPiyKSFaM2yl1Q2BQUDzAzB8YNE0TJr2FQVFNKlOzO62cL1fAYzhVHm/FM3IbyMQEZCaWW4M Cg8SvlUGhbIBSFBprHeXD9naYCo3Fm0etMYo0lIUfHNNLSh2I2qsZmmUYp4qHNE5YWSJK9YQpV2p rpRH44d080cUSktmQPGAgbjFTc2nRdEZIDGbBpAkdlQXGDUUkxrlAk4MxFcshMG1yt7F3hZnOvRo y3TV53yEJYKin4ZSHEi8q4BPucYNJlMq6BG7gzi29iRVdXKIZgXbCymCroFycI72LHspWs0klKrO f7rMpikrV7kDooER/gbNpCoUSwjka69iLmSNyRb9GrWVz15zkqUFuFofBOpLw6jSqpTQrdtf0UVE SfLDqtffXm6nPVWNlD6eUH+RlYxq540wqWj3YbxClep4oqWXXMfj63GWJXOHjMmx5aWtM0OaMC4x kUDmMCs+9lmDLE2CyI6xZhW8piGjmm4SCdNHGRGjui7MjgJRdwRTjKS26BGcP7hvjkCRUGvdroek w79oryEBab2SPzOF6ROYSCUBJ4VJDdbQhim3CiijGIxNLR4CMy9TgM661WPrM1UIxHTsFMU4O1zB qCZxqxEWTL91dKRQcIMac6SkGqBL5SNgOWDlknSNzE2ZOIMo32FHanKOWZYmHpJ/UmRK/GR00JEl sVZbti+5UyDeOYYW5OU3KT+S0kyvovBkyeDZiUOa9nXqvoZRY8uKoOsxtEQLAHGU4YqYJzxixSiA nItHSVL3AlAoWdbpVFAuBPmXUq/Owu5IpwoSGRlxIgA=