# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100909121405-vvfiuolgr7iumjz7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 66d92e2697f86a577d6426984282932d02217796 # timestamp: 2010-09-09 15:14:21 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100909112752-\ # ac5w7zyzbv10nvi1 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWat+86kAAnVflEAQWuP/93/n r4C////wBAAIAFAFOS8hVQalrQDTBJREepkBPTQMp6elNMTQaGRkAAaAOYAjBMQDAJgmjIaGATBG JhkQJppoCaZT0U/UQGg0PUHqDQDTQ9QOYAjBMQDAJgmjIaGATBGJhJII0NEyMpiZqp6n6jNAk2UN PU08SaDxTQtx5pIPp2fAZjZty2xk45VNcnGwByEqrmBeZ6sFNKxv4wREP16zcxrz20rVB2qNCI5f 7DP7DS/5fPTtYUvCFfvyHCZiwbmCaX8JelH16uXkCHgaKj1OckGbO/rN+vYpuz705+4fkEZlvFNY mjzrKgslJQRk048gB0jU6hCLSD3QBvMc30okK65PJ5yjfQysoQS8PcCR0hvZ6tvmjF1QMDhyCBjI fTHvHpBQJHbyEqipgZES+zbURGrHKGCTmZn7SJJAwIutOraGbzsWkks4h4iOT3gXrYag/HCCB46R mA4hVT9ioUNbabuIdu6oDdas1Amggxhvl0F+iJsFIFmmhBDwchJpqjN5rQNxDNp3i94PrBa21dY0 tuoCkBjyr20pW/F9TRPWU6hcJwDLzTfaLCZoLGra+sgRwYiOwWfMt9KB0Qy0lQwzFC0pVcZDsB/v QNS1l16yGCcs/lwr2LF2GKU4KUm2oKuc9gDc5BRlodpyoh7JTmQHBBbQKclyuJBp0FriuzTDNevW sqozH4XrUbxXQtLy9E8w0KNMhK4VbhmAxBY3v6Y0CxKNmTAlYUyeK7w+zEQfBu9xuVbprYVzHiRA YArgWlcFM0u21GvQQHtjXgDsY3X/ZSLXji5pSdBpEDQRKhqCkJjwkOQxIaKqFTIYel3rlOw1YFbj rbb97dpedYLeA3VPA8bTQwzJjyQd5Pq8fZB/HCuYwFjWP52+pcXMegHoEpXv9gtRX62r+lcQLbrQ 9XeVfzejtAksHg6tl5fW5MTKtvJlY0W3xhNE0AtfCQM0DDjazpAyycsJr2Vri09Cp8/BCMY14kBe y7gLvOesoC6YEpAcp3ITkbabZKRWplqkK1Vw5OC+tIqhRs7HR42qwY3kFUdZGm+Nt4iZg5oxCIUF CDwEi6dSChPVq88vF82lw7QFCHOJRiDqKwtMdaD5jUdK1azZwWSFaT511pmgJEVv1kL4XByOwdDZ DB2vRriiblRfebogzsFXP3H4b8LyUXFBBPIftaUcrjfl6DwwQSOldAmRPXkdOSkrDycIknA0giLV GaR9RtSF5K28Qj1GvqfhwrAG566AxMAPcFGpYhwGbaLJPKmPMiXBz6DaWJri84niDEDTuWnBJcii HwIoVHAUVo8Ss7tpyESaVSwS/laziEw1IKdNvNSGxZ5pHpsFtQQPsyFuAmlMcAdahWhDGYWGR8SR KIkfEDYvqfk7deix5MP9QYloWEElQUA6ZAiyPJZ0hQL8Rk0R201IPB4bkWIHMhhdiz96DigokgYN ReDwFJLvIPQMf2hFIqkd7haBGSA1ZDMhyeRnA+7LSHyClIXMEAKDmLFhI4UIJIu4NrDw4nkMSwQP A0FbQ0VjcEEqiTElYHqQJ8aAUioXu2PjwrY3jhnFp4JxMyOJSY5lgOQVCrSZQci44rmVtGnmKAew NUb0yFYuJiM4ONovgFxqwJYg/dWQOpYSedBOoglQTC257nXmWK4F2yoyuM6V/HBZ/xdyRThQkKt+ 86k=