# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602113441-96fny74sm5os2l2s # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 2ff5ba923bccf0ac14fd5f93a94fa9238a4ac60a # timestamp: 2010-06-02 14:34:48 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100602110400-\ # 568a3b2gd9uxxxvg # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb+8ys0AAmTflAAQUm//91MC AoC///9wBAAIAFAErXs53dHNinUVruISSRkmKn5NGmp5qNCMap6nkmjJ6mnqaMJSjCZPSaMqaNqD QDTTQGgABJE0Chqn6Kfqn6TCTaTENNDTTID1BgNAAANAAAAAAEkhTADQj1NEbRJtTxJo0NANNdXq wX57HX6xunocp77GpeovcdWREzjnzui58+bnB8LTEcZmZl5fRfiKasPnqyyr1s7Q2u7PRuZTcMb/ qeX9fAedrjH+OODJW2YQZqP3o8T9fbqBIwtKgTDlLbhk7dv5ml34FtSXwFdAJuQuQFopG208NRs2 6OK2hYpCBlyEqLaZmmVC+E0i5JSl2uoSWOIBnxFG1vZSYLvrNW0lBWLSQszIr01tJgZTIO3WdnLs 0T03kJmJRmhJ4WpaBtMsLwDCsU19GBRkXohBRz2CMleraTfWaBBXB4o0+JTIi+Qkq7G50UwLBM22 w0bH3zs1uCS1SApCyNAeH0tbwvgKTCbhdU9E3owzegiRZo4KV4AZneBnkZy1/6IFm1ObaXClCSqF BazOKncVwst1TplC40ODL1gVJvoUGQE3HtqjoiRMTruFj7EQNWmybFxLU6WBiX7k+txbAiWJxOJ8 GxU4sDUPLDqBJQEqrrY0b2rwFXrIK4wiGoUgL5h1GugUuYDTitipGDioir7woyKB5cSnJLdosqVE tsYJm7JSF0eKZab1N8fCdYJjWFRFHDLcZiYsL2UAq8armjJFBt5ZkdJdkn1c7Zr4N0dsdMtm7GFG yUjbsatVks4VHBrNRXRa7XF4LgWwyPUD3HyH9Op4FotA+qYRYUpmG9XahFviMF0Ga1kO07dXhHxz 6Hs+YUTMeSFmn4EDjcJTncdsI8SdAUEJjEgjcJeewpIGHZW2AfopQHlnelyWsiov7hPKXV7fB0mL ir327hcORAmKHIcZKgnNRza3jDcb4MMgHK5ARjpDgqYcMOMK40BOEi0f4qYVfksPMWS3U9hOJzRU 05Fe1OQHNichjrLCBDYzRImcl5G8mwXJ1RBGfj/aqo1BYaN2ult809eLU+7j7gHVG5MGO3YdK+Ff DPeFSVCHVCvYwo3nnzmN5OSFM+ZfgrXdQExQw3n3OY46AYuKWZuki8ldsyZhN0MuOphtI20W2uax eW0qM48+ENLrXI17BIlXsr9i5IroVXvjofRaLAXAvkOP+zKN4mMRL4IosAKFQwLeGgFiLHhBhLvc VoBg+NmPpRMqD6AFADHiJaTYdjJMSRLVWSV2K8pHKqBBPVL4JOJklrZDw7rjOYoW/etASZMwc3XW g6gCYYlyQPS85DugN6My3YyLqBbqNw2Oq/Bw4JVCrJdNZwnLh0pCyCiIcxN4EcRiWXCxeAQRauc3 1LnTCZepkiDDwIXkMSM14d9hmJik7MWgVflgoFh3DMvIKbx1JsDnPjjVJs6kWLk0BTODE9DKxbiY VOdDBa5YLJKv0yM4I1C3Ks4JqQOie8lWofwUNx/i7kinChIX95lZoA==