# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100505095328-vetnl0flhmhao7p5 # target_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # testament_sha1: ac6f59fdbdc0700c8ee7eeb381f1ecd3767c1a25 # timestamp: 2010-05-05 12:55:14 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100505045224-\ # 9022uyn2moifp0sp # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU663vYAAh5fgGAwW3///3cn H4q////wUAT4SeK6bWB21trmzCSk1Mg9Keo0zTSD2pHqeU/VBoAMgAGgAklT0m1H6KNRpkaaNNAa AAAAGgBoJFNEEjE9JtJiMKYhpoAD1NDQ0GQBxkyaaYTIyBgRiaMEYQaNMAAgkkjCGhMVT/KmyNKf lR+hPSR+lG1P1T01DTEDQepIuYkTQNNjY92P3DXDmd+bQd7Ye8cuzUb22hBRWjWJ7dM4mCr2TiK+ GkqSvLxmYXww1bSZaaDIXQ2xdnWu2duUnouoXPJSUnR55c9C2Kb2flOvJ/TYVT7InK8m4Nt5KKjt lbyyzsg8JIgZ3Y7DP26tMYj+ccBm4wIop2oOAv1haVw0Z/mTzGMOut6OIjD1gM951BWnCGrAmhMD F8J8cMFGi+LdGubryp7GIMiUVigTlrOKde5G946gVccCiWF0mkdMhDxJnEqe5O1XjUkDFzFRZbKd GLMT8O6Z5WXi5l0LIrjBJeaSjfEWbLnYJpwbRzKvcfkO36Kd3LPmOaoYxq14VpDXr8R8wbWojlML pkqSmoUVHNiikMu1vJGaiZmJuVinBzDgmwzWpTfTqgYaiJ6iZUrU4poi7bUrEz0wkTVIUHfTGNUw 2GkqKzkr/WgsOLLhszFWVl250bQW1hXjG6Uk+msWopFvLTAeZPzNKH40lVxUTxOWBylQWYRNWUlN VQLyl125oxie47NETk01s6oQKDYQvKnZG9RJUOZNW1Bc6gnEU1FpKrBUECFbPlaUuM0+0mEXr3Id 3s2ngYsLpYn1nVgSOymk+VkPZznR64pIqiUaEjnyp7kxfnuDJksTb+fP9Y9qPcJoyP7IyWYIdFz5 ROAUA4RCJ8B6IewiiYPHyaeBHCjtDqD0hx2WOSaI8z/rVMCq1WU11KA9hvHgenJLh2MIvsHB5+YF 2VCcXPvV6XCwWdYjFjmx48F4rEgvA6T52duiDlxAcOKzP2kPKa5LiHzuKi89p/2Ct6g22bEDmENM MEidF0sVlrOZmPXAendBI/ArFWGmw91a5XHjlhcbR0t67t5qHJEL1mZFpT6T9dZzKo9TWkx4O7ki dRQDlsp13jpHx70wExUI94/BMiU4SbEOovxT1gFYqwJJ8QxzMtZsrCWPLa0iIYUqq2OHHlVkJL0o sT41dUpvWQkW4J4DbGz8cZ18wtYPkE9QzEwsFelPvM2GPhjiEx59QxsXR6g0SgHotc+AXXGw9e2m OgE+gCRwOimmZeTQYtCtXR3awOMN/KBs29ANdleAWe5TDUDKgNrTEMVCmC9OJipjSqiouXRyRjpw 5UsXibCZjUxiVmof1vPsFZptk9cVVSYBtktXEUudcUN4ph7BhcbcNqLCqUBr0kDXfFLbp12zabQ1 LlqaVoq8OE3GS60l+Y1gHdFH3iJhauxynlBLjtim+IrtRv34lKuRJBWC1f3llkNnzmNqSSu38CvV CWtUlJDUilv27TKDxwxAdUSruGVGOGnSRYiqywwgM2aca0dIpItLQHWFWBl6VZqe/ajHC6UrnBi5 I6ic6giDMLouIsV6iqY4pKxNSEU5ppiDL7o0G7y6Us76yCs712TXaLDhgBiLh4OMaVAncZyVDm9i 7Vrek0LIYIPd/xdyRThQkE663vY=