# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110420071304-i7b6a1q05mw43n3z # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: ea18a9215c964607433f28464637006fcf89f9a1 # timestamp: 2011-04-20 10:14:29 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110419131651-\ # u6o30y24rhwrdnxs # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcsWHm8AAylflAAQUmP/91MC EAC////wBAAIAFAFnuugSEQKAKCowAAAAA0GgDQDQCSgqn+U8mI0JTNpE/UJoAGQYmGqfqNTSGmR oMhoYjQyDQMjBgAAAABoNAGgGgEkgIJkxNMgKn4IJg0obRpFVV+RBj3+zqe5gZ6qw15NhbYibFrJ UwojOJRKTx62ZRjDAQQQPHVofECMaU+cBUV7A+iwhRVozinoTv/D2tlFrz8/TOPlgJd9l+IfJecO Pjv/AEIOAxFMO3ZouaiArC/fYKgiImJbmZnRmPicye4aTJq4W8QpBwu4CRlq1mFtLnOrsUQVo2wE acRwC2CjLOL3EbnCekhzCIC+hRV8SaAaRzKhwwmRtYqNf0UjqR8Sn8CiKYbFcjSwMzNeHE9qgFcI 8DicAtxIF4CrFAiPFhjmyog6VXGRYPFkGm4nS/sJ/cbYaR9xqyDuJx7seOoHIrGFrGxoyu3rZQLG eO3LbqLNIBWAnA41FKp2XUqp7glbqgrClrBLY/Aw+4js6TPHoZOgh4Ns1cqAXO8GhvNjDkhb9LZU m59h9WUE/aROdKccRe1syJZI0UEaWNlR9KItq7CrvENSLB70bhjKKcwIiZ0kCKt1RPsTh0oXyMMr FiimVaGCAcRSyK6grZpbCeRXxC8lXfhpGEWWl/QLpOD1DcY6tFYnFdghiKTQE/TuoxaWiaYMMhWk kXClbjQJxaazyMtvIHLA4CNWJOFCvUsh8dROsVlckLDuFxsIpcniKZbkJ9RjRGSoRwJlSNh8jTWE WmSbLG4oYBKDaCyOPDYz4ZBJzHv+YiQ0kBW/QMPNZvGkSEWDwiOExMaIUJToGKxQD4DWepaYBWOO T2bseB6lotofYMIKNDMMJj8uiI4K0a0gWDJdfaAScBmK4kXisfWxlxOAkP3wOpAR7eQhVFe/kxgR S2CR01msgYViP0TEjcDZMHXHWJujGOsrC/HnMXUfuHw6Ce6o6/0ZiDd5HRAwXilQrKhch/EUjUKw Ui9nlMb4HwdqwgdZfikMGCFkIWhoUt3vfnruVqZT1HMexaPNKLKROKJyExWTx9C8Y8hZQl4NLYLm GQdAsK+fY+WBKrf00GWBMjHuzl5Digl5MMzqihLM8a9jYu30DddZ24XlzLcb+cTGVZdW4sn/o8O4 C/fEN4mE2WuzaenhzOZgFQEhOPMVImFbm4Tr/Pz4Lepi6mZA4OKOB0C8P0eZ5HNlaHwIwy0oJWHN NtA2U/j0EUhYjYSURQD9izEwbR9hE+xMTN4WBkJ4PDHslbMKvvMwIlYFHYDkZQPXgv5tSMUmPbeJ H2ZpYAL4OYcQLALBwktIiBWITBVgcjVQe1JpDuAmY+BIzD/TmM5DDRjdjREVYYPMQueAjAcFIkA8 BfRXIRBwmB5Igk545uRqSeENwVCHjCYXQO3Uj2cJGYPDVuBKgD4N0F+xCpSgqkfDxXtmhkxdkMMJ wQI4RieAtXI9HZsFKAPc+ggIoOpUE+4UJ3jbQAoIuhAiQgkwsvMH6SJo4sMxSVBQA4muLJv0UBMC ZjwHDGgNAxSXBvGkY8yYP4JSS3THivBwrjg+oi/QkHMilOiJg1QrcAPkRwFb4B6TCQqxdwmjBFoj Goe0yC/4VPE9RdyRThQkMsWHm8A=