# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100622120533-yki7l4uo5kw0fu6e # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: d5b3c0e1856810e69fa8e03f409275bc736ca245 # timestamp: 2010-06-22 15:05:39 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100622104317-\ # 5xl3suwp1hqjtd80 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaoRGsUAAgjflAAwem///3/v FyC////6BAAIAFAE/cb3ugqw7j2FDeu8JJEAjJPTRPTRGJPwp6o9JoNDTI0AAZAyRMTETyaqe9CG ommnlA0GgDIMgAAMpimIU/TQp6p5qepPU8oaNMGoGQ09QDTanqGmgxUyk/Sh+kMnqnqbUyeU00PU B6mgZBoAAAJST1GSj9JppqaGg0MQNA9TTTR6hkaaA2p6giggkPvWV6DBdhr/gXjl6RQKpG+zGmfD ouI90A+mKli3s0NNGrreAuwShw3VOc49n1G+0JzwnDDzIkQIRev+G6nS6PJUmQoTutv/dVTB2Ze2 HdXXy9lKOoEhus2wmp4Nu1ROWF3ENYyu8QlkqxISlDIPFZ7RbAfeJTRYEdmmet7Nxe0U3qwFtwX6 xUeC4s/LEz1aO2GJvuxFTohHvdNmWoSdf4kEW5K9a7b2oQMLJhglUEnhQTAizFBkUIhGpciAYs/L 3CgYyCINqKKxUREEs23HAmy4YBiFXOO+8g8tp2dCejwjUzUq0TvigFqWx8nDHEyGe3+Xvrln8Gwp HQdzBrhzVg8TQ6Co2i9udDfAWPF2gBUDLWwqQmFmLWAh14dRrsXQNIsA3dKdJExaM+E6XSJwWVXg pGDuLMoqgyKHfdTQt4wsVRlqKikziqYTUhvC8zIagVwboknV2DTGWdMrIWtB6RKFxUZ68C44SWAo sEsgcD/ZWUiIrSKEh9RK/HHM1Ha7DwHyPpBS5AIjNVRJFlvXnC3XmARjKR8YPRjI3yM2MCkzWhhm sDZ7Wi+xhO5j631esyjqGooMsZBl9vHpHftppPwcm/my11SoUkQglwJjg66GAGTB6F1EUeKgI0uy La7p6xpPsW8X2O1q/LDReYxJ0/byCaT3CQmYMM5raJSsZAZ1HfA0+iEq0kZMhlPz7POVxEVC4hTU F4xg+ceFhjSEUgiI3kJrvJBtRGPJ3lZjx4Nm/7HZvIQuYHo53dHmWKI0NJ16Rwcyb9JNTZQRqGXE WrR30iIsgzrG5Bw0KEE8a6iAnTapxd5IhUh56/tLC9jGnjTLIVlXb2RVmuSDcrug2sXE+fx6Cy7r YQoXoUvEDCp5NzKGyBaepo4pyUFAn7uBOE/I7rQO3s5djOG8X2ikjugd5Xm4Bg0BX0F7SOo8BVZn 3Iw4hstxxHbtsaMmtAAWlaXTExkyDxAd3fO6+FI4h1y6gliZht0X4SmoUR2xaUKYg3wIOBC4aylU ubVWY2TXy7H5YQ15RZEW5FRFGQrTdgaB607SM7u/DQtdjjc0wnXPhcWtpfQOYOOD32mZrAmOopZW FHb1x3rQGzTIcgqjQeQ2ptcWg2nRRCqyJQ6ZcoOKn30wvU7Jj3dm6SOXIUIdwaa9HTBWZyPx8/gt 5YmusdchfszdQKA5KiTkBwPbirRsU58wYAQaRGgTkjQlBMQxrPy3QEshQkvQhbd6b5nQM+0rU+qC idUbycfGRHPPLDEA2MEshAgZQuHa4YVAgu5kDqhMyZSNbiYMhWyikgZBVNrcwBlmS3vgX4EpAflD B6mo6a5UN1pp9VjnJ5gZJd7uKrw4S8FgS8mxJwgvNzhspJEJMBgEtLWElxxysfV/LNTIAPeAhx3G qWaxQOkVp5ar3uGpd59RC1GvEbwe40gJYmkqfONArVMOQNaNxWwRD0D5vu2JBdmCwLwGHg1Z1Dsx 1V3A157vYNiuMNN56AWyh72GaaUCgFMrBRkKvC0H44jtqwox2TOLdgJdNopu2CJr3WznP4OA8D/F 3JFOFCQqhEaxQA==