# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100819102332-vfmgh7uzdfpndq1h # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 66f40b718b80aa801b97b22be8c942733fc4d073 # timestamp: 2010-08-19 13:23:39 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100819041647-\ # wx9t9jtukdtb23jv # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY52dtoAAfVflAAwWnf//39m 3MC////4BAAIAFAFTab0Tc53XVxpbjobgkkmmQJoNMQyQaTE0bU0NDTTQ0DEAZCRiMmimnqn6m1T T1BkHqNMIyGjIwJjUCSIEFPCaU8mmo9T1GNCaANAaaGg0Mg4yZMmIxMAJkwTIAaMIwBDAJIkKeam 1GaqflJ4nqnqaejSDQAbU9RkA0AYBhhmZF51+QZdGqyvRJtwP47v9/abeCkqqfoyMKVkU44UnLbt hKOX9l1lp00fXj42ZkaqN1LDsnXu3QMmmxlPzxyRmq2X+rRjfnud/thjX/e1VETmvXrfK3PrQVVs +zUghG3qByNX5lA99hxO9t0ZlmFR1zocVcMZyjwWTjlU7FHZsZyZmaQ0YmLTIMdpZmJRsw5Nu47c e94uhDssblMvNq9m6V3BvlstMF4iPBelcZUuWbX6NPD6BbFXtTGM+EJ9Sikc6UQ6PVLjzU8UBGxm ETtEd9QAxWGipdNN4jChURlZMpW6fctdqiERiDYc04j25RdPq5N5yyWUWumlhQrLa45q4Zi+whe/ zqwd5V1CKl2LLz2HTIIhTQMyyNd+xSyK7ETsRGiidWi0qa+D9Sso2rO4MehuxE5plW2YqBQzGi3J grC+m4LwsWDxha9zBKayHMDVdqJldynXAqK8O9pWNF4xKnCyrIL+Nt7KlQGKtC1p8s0Lsq6ijE5V GUVoeOhPW99yrI6BytZ67QhFTWqRGJgIJvA5rWLKG/I1mbEh9YnOAqbFiwpC6FMI6BhLaLyBuTWh ltsHSGjWfiU2ozUVIITWjkqkBbRwrVNM0CcJp2nW7H3F9dpVbzSOOq7dgb866g2pd5X8ykzMMfTz eB6yJDrqR9R55EzqGLH9497N4DP8e7yNeJlwYHc2FBA+Hmc6jpHCRQudujmWLG6tL++QriBEN/Mk PejIvg9UZB7eolypdFVLW0vbGxvkDofmvR+7UrEFMj2v205m1hiPfInZ7mVGBNU3kBtaM6VqgAyb PoXn3yUEzH8DWJFzGFLjcX3AegbIlcBp1Or4CyJ0jh3JpGD0NUnZAwargYjAx5biyRwjwLFWmYxU ScEo8cxrYDSmOVlVkDmD8u0SAgh3xbtxBt1l27gvc5MRccfRslkhZyPcnzAo6dNMnwjdVdU/hfuG qmDIVsVZnY10ydvp+3dBpo6qa+JtO1xrAlwMpPUnJtkqfqviPhDge4vAxou2MNokDJtyLJCbWQVp bTPZcGBOePHAxFe5tkJ3o4qQ8LB4EXihsMLhxm5RPpDqpS3yjvens2WKkM6LXHNgZ9KO1hP4VmdH nlWtXPP6GVK3kB2bOT03YXwpIsyZJauKizEMxhNobjqDnXtV61pixjOnS7dYcgFMcgtB3D6jJTIr dtrSGNwEufSoekBcUkHJsjZg5JzJHET/B1BMtWJvDSGkHOxgZZDNSg+duWoJlKMNU7Ngw7MlRkES ARG8ooygnaQcOlR7u4noVRIKkWCkyZPjycYyVRqE2PAwaPNs04bqAnvEHoqhAH3xoN2JGAYrU6wL qLTkWTOZ5djMnG4iqhVa4dAoFEdWpknAFeZb2eWtbmJ1xvsRjfvuS0yAvV2yOW/RTmskiDlQRZDD KGZjTreDQKUgQZ3RCO9KmcwnF9jX0UioKRsWmB8zpWxMcNmi8wY56yDQwRcYSzunZ8cudeGdkda+ BEMA9QxK3QpE9Myy50ZM6bApDgzDQvYZCmbwXJRcFeWGEHFeM3/mnBgaH032mj2mrDeN/1BeSKUC pctMtgt8AjQSRoapRqibU4ODVaFzUK1gzA3lByc8hWmbP/i3r/4u5IpwoSEc7O20