# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100608114734-zr70kxe26ztgwbat # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 3bad85787babfcb45295c450906b33f7ada8f9c5 # timestamp: 2010-06-08 14:47:59 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: vasil.dimov@oracle.com-20100604162253-\ # kn1erufflkqhsbme # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerR1qkAAcHflAAwU2///1MC RAC////wBAAIAFAD54HK7HSgAGmoFPSm2qGxE81TygwGmp6mhiZNNARJkJmhNNoyAQA0wBNMjQAZ JU95T01BqnqP1T1A0AAAAAAcwAEwABMAAAAABJIIABMmgaJqY1Mm1T0TyTJmmUE9eTvqPxq4iNVY kFUzZIAXkB0LF2VqrcuDrXNZjxPJIju2pQ1+G9aDGGKH6F9wIbG+Xkzd+K93uPzPH6UkCHxyH3wy 4dQcwXqJ0lfu17YlT40vOHgPspWoFxX55S4KmxWmHElh3LZz06pSGDXrESuXfvQYz253vmpgtd7n M5sGZsHAn3oW1PugXyeXlRKMttWU62vSK5B8rkmkQy5/yxTQlXgL46alR7uV520IXfYePPsHvxSc +RSNn8t+b6cb16Dhe19Vm2rFPY9U7HTxpK2UcuavxVLFu8E3vVcn5BLyMxWUR0UqviGz1b0RLPTJ PWqWqdnwIikwKMJ5mbRBmucAq2hBqILiwli2h8FBSwSKiRqozOIwi6djjZyekO2qb9tIYaRtturI 1trF0iN++b2hASjJSQWDOx7VPAaytb4KagV2OYnKvMU8lycVXZXoEOFGMB9ZBGurqz1OCiyQUyJq z5TqKX5OivTFCGCDYEkRMoiAV0gmTLlA6oOjXm2v9N0zzcIQCBtAzGOk/LLhAlcmmaJOE07TqCr+ hvLMbRquD+XZ4nK5cvbonIKbGZhvw6RFvMYOF8Wa5g+D6HP+/OUmJ+MAzDTTCzuQdOwf1idvcJRx vIQDgg8pZ9RFed8ZhfonQaLnsCyhJu0TpM0atbKbAwYPAJELTtD208qkz5eaQQi3L8/OUGOWpdyl oyVuSYNZy+1B8rdf1Txk4StEqrtfjtH53lFSkxJFK+EQqV55Kez5t9V3F6nn8Md07VjkBquCbWro 85qG4c+CvYVNlIFssrxdOrNIaRNBnkdHFQvRB2dq8ky15UHXt46lx1BTQKZP0VKZXsq591zuRFxr USWsiv30O9pFscdKXO/kOup3RKBiL5di2g0/wrrVlMVFR4FSaGwqWCHr4gsLOQXllC/3XJCpG9HA lfNRlemA1oPY1BMsUiZcBbN62BWEXIUYKkSYq9rLNqw3Xdve5WWHVCnY+aCn8H1G3bzNTVKFupbi ocEhEhTCuRaLa4mjJqePFBnG6MV9IrTaqRPZMtlRzZBHMTLUbwCVHi8/QlME68XLDFYMYcNeb3KB JNlDBdlUM8leJpxBpuPtIKm0tGmLopE6wrhdJFlFTe8FdBjzUlWLFFSzQ6ZdPzGYJUORvZme70Kh oTFppmKF3CnJpaApB6i5XFjdLvjaIlT9g5UX/e1VqtOxFRMfYWzM4ikUTk3F3r37btZNoLAX/Boe p/4u5IpwoSHVo61S