# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110405064810-ro2g0ihj2jfp5ko3 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 9a535da20a9f3c5f0986a5ad56415731710cd48e # timestamp: 2011-04-05 09:49:00 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: vasil.dimov@oracle.com-20110404141929-\ # zpz2aujcsqu25rua # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ5faxwAAjZflAAQUmf/91Mi EAC////wBAAIAFAEeKbe7cGyR1d3ZQSSQlPwCp+mT0NJqYJtKekaAyaaAkoBMTRPSNFPSekxpPU0 aBoNAYSJBCnqbJT9DSNNTCHqNqeppoepoaBgNAAANAAAAAAEoigMhkYhiNNNAGjQABflt5s8+ORw 253KeenZrwCo0nnZTGkbaS6LMjQWDbbDz5BqnW5jghuIIIiH/dXHXdHzPr6yN88T09IKShVtgK1f U9NMdOWA6/vLqW7gBDFqFQqZHa+zX3m37i9EL8C1FzlE/Dk+7cBvmUIuLbluEvRSRKnaInMyV9p1 6cagt6B4z3oW8V9XEmSQrUigoT9gF0vwyKENNFco+QuYGQr8Fb0wowv0Ocq+FgHjihXcdmHTu4j+ Q/ahOe1L55NvwvbN3AILBedPoLZn5V9plJZeUjCstI9htoMvDnIYNBzt6FSnlmFS9ldiySviROIN qUVahD6jHXLUAHoCFhPAwkXCpC9WsGogqT7iSXZcaxdgXxB/MbJ3pHQs3eUmpK8ZOrpitHTM2AMZ W/KU20JlNvFOTFxSqjCwCwrlOSJdcGEx0hMPEqilCGRAaYmeou8CStzmVYOnbJNAYN1e+l0myV7h uFv6ie+A2Y4WyTxYzkD45m0fbOFHSyFB28T7vAgMHuTjIaddaFZ2uOJmpQWSyeNvWicJrX53iOY+ m6xAkVLVdiiDJ410ZEibnKTQZJkFgiWDNgnryW3jt0CrWe8c415nLAXlr4poLDQMbfOKiJd2Lni2 8Gi46PKgT8IRieQLxbnEV9W7MRq3KkSqRqaNbGjIR33F8cKKEv3KI98MVEnNLPmukgn9cTzgLEy0 68AGJxdvgWRAy/4imYGgUt+HTuuFaLgbvb412Ob7oEpLIS1+vJTrVpp5+HibSZiYmo4YxxOkLS8J yzKVR1nKsx8xVD1jvKroC2eKyXGWyvqd8vPrBSAEVfLjvOcfDHgdzU8cG7s6qsYTwutzvaayskTY 8Y+jn9LvizHqx2SPe1ZpkWWYO28NPCBRMjKVEc4nmhpvuHicvGpex0KCNTdQArLLoE8GZVQWdqik YkVul4BoXgmYTP5ut7eSG2bE8CpPFGRq84u/i8EWT+sL45ylF9CJmmaEDek+QCTEIujKIe35EJUQ pAmSYH0H2CXTGAwSYHbjw0wisOglIRl9z7Jg31911YfkcaNV9KKUxtsLCJtYNE32yFG2topMJwvd 32sRsqAcBM7nckpUocYpDSL0EmRRSoRKiO9EgFt7DAcn6YaQjyM1Lw11W+oQBHxc3uBqVK+xqssL RSMFUDR+fhKPaoizQDk+fTqjGEMc7MVh6wQ0wWbQzWq7CY5MNeVlFIrXe+msTj+he0TrJw1Y2jSU viXfBk0VCAotDb5LvetbKa5jxVryVXpLJMLJrluFIYKHYwkqZqseK/5l5+gu5IpwoSAcvtY4