# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110210120758-k3te77eu4shqcs3j # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0eec42e37dad1f895c1b6da9d408f57e6c856010 # timestamp: 2011-02-10 14:08:21 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110210113250-\ # 2czsxx630zgm8h05 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQIEex8AAYrflAAwWmf//1MC AIq///9wBAAIAFADfXgAFDQDQigMT1NBpoBo0yGgaeiGgBzAAAAAAAAAABzAAAAAAAAAAA0FJ6ho 0ekGymgAADRoAAJJBDTUxMENAQnlNMUaZB4kzUGcVmV5z8BqeKIc1KgAc5imiP3MjhuGZieYu8DK t9UNSk+0X4I3Lk9HxovVa0Qw6YZgFL+ZGEEMoniWPKsVpsh0L2ETXqvRUrbLm8WntulGPst6RtWH FLZlbOl4uc057/BIZaJgCNvaJctae8WI4jJxUwyp+vYoh+y0XVXKhl0psQSkg57Tw7Ugsh8HoJ1O sL61Zq3r7mXvqjl/Kkfb55vJstlubt3doIsKRZINmWJJRzokn3MF33b7o0tUqi6Zas+WpMUO6lOa qvT4/IXMUeclFYscrE12cKKi4eaDlHBc8apH6/IseVPEOK2HRb2tH2G8k+CtFfd/WAWRVCpcZRhN xkW4qnlhs0Wd+UlWpnz01Yd2CeT3JqsRYqZRXAotFQ2V1y+khTkUTeghwTRafQydZOWrQpsWatLW MlqxdXG5q5jWwok5YNVG6DRka3lLk1LRKgpqaagvt9jM89mZqd5P4dttyz/S0SsrTM3rzfSh1x8z mV231a2RwYZU+cSCcGKiaSS2fHofRIlS1hlKygKSOxLXr10SpR+KUtqYO/wXgdDEHvtz6afhHTH3 4ry7gY1LQn2XmuS79a09MOWuDMkWJGPwLurTF/dulpNRTPU7x/n5qC4JvLvL1Ip7IW2ipzZp3kBQ yxwZaxo5osgpQNq12NM2q6bEha9nNlSCciiN8TEy+sKdu3DbHlu4wHSFWFKhvrYZMtzvlrc4qwOm uoNht3KA5o6yj/fl9ODHiRfSLJvjRZeKbeEqHCqmtxt+DVqajxeDUaElinj1ec0aqffLXCsOgcnd fQWd6aYs0vziHnmB5nFaBYFjg8ouSjqSGHTv5VQpEW9UkRFzEwOR0ZJFYSuJIUKhAECgSwKQUzbW MlkptIKwMuXADrRbWtgKkO+HimPZI7wmoOUpYhxxNeTmUCMINVhRhxFm4Kkl17KUUU85lRGIFSu+ IWURimTnbBP6vvjX/FnBie8Vq3g+sm3aZUjLgpQ3Ob1NfYTsZ4HWrLnaVhMHKMHrCwV+zekf3zpq U9S1KCrCF6cnKhWWHFRwX/F/r/4u5IpwoSAECPY+