# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110518120508-qhn7vz814vn77v5k # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 0fb48f1ee7e21ee8557ca64d102404504ed5239e # timestamp: 2011-05-18 15:05:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20110517121555-\ # lmple24qzxqkzep4 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcc22PMAAa3flAAQWmf/91+j jyC/7//wBAAIAFAD3PB6FzABp4aQmSaYgA9TJoANNADQGjT1AOaYmAjTAjCMAAAATCMBokn6TEZQ J6aAEYjRkwExMARiKb0o1MmnpMmh6QAABoAeoNAASSE0ACYmhkJppGmSeiPUGQ2kemoikJkvAlxw xkKKD2PlIsNEtIgMPGNxHFBIhCGmcSmbSpR2kNmAB9h5XVzd/amHK8Vn51NDgdnVXn0uGl9LoBKb BZHc/DMowuf4A5g7RykK39PdVYvQR/a7dVzpnU2XiH2gLTLumykl0UUjByRjjXTF6WbXlFNbxGai 7s4kYQEyCMqePtFB1GM49hlzknf4rrirSZiLNynmSJcPQ2vlEcKJfGMsV3mIveD5M8crar6818z7 22C3rcdPzVao+LhVd7J0CtkUbrY7ahxqIzmFIMqmxQ8hRc4oLAtZzzkHiASmdmheDlTBEggUFviF hJioSLJyNU1nK1oQkc83uGrlJiiJsMVvMdHWqIttKvuFayCMLGWUy4BTKGJrKhyeUeosHZUF9g8s ki/KBDF9FM3FXXKvbO5UkCmwgp7qZUytCVR6aqNG7tFPbBOqrHJSClorV4FCeL2Fb0khkbBsLYXW 4hxG2KjbcpkwVZAwO0NdSUGmcFTxmkpCSIIojjNAwCNh+haBPjqiw6tCLuKSEUitEQU8YjDkHx2Y forG4QnbQpjR6FG+iaeZnC5TWYh1laErr+gJAiJbmS2IyIHk27gCebCY6iQNWEkeeOMltQvvKkOq ctPkvGrE+K8MOvnohiadNtWi8qakUqT8bc8mYFbWkWvwRdu8qp6FeVyp8F2fFYuwrrb5reThrRNr zOjr2dhBCw0revo9zFh0536lzpZgdZZZJj9JJGjy1hlne3PZJlGmjtbj6OIJErMfumWaa52WNWuu 8mCKHak6qtOZ018+3cnnOw+/WY31OJ/JqPcSUIlu6G0MSdvX8CdCwxpgZlPfcmhmZK55guIVVzfb bskliGWrzkGvrbL39Tgxkmdo7FI9cw3AtFwCkKXJKjl4OSHdq1dJVnnoqIxvSPgkcA+p1GdxwVb5 zhPCBStffKvaU5C5icRniGwHwebIJ3GQwQ9kwcun16pyQ0umM543QBUB4RNJf8SOIWBycqjDxt0w VDaOZM8iyny6xzF5rHyU/Bql7OSW9qd2suU170XW5wJL4gqVtey6i1rIgZPeUWJF2XzGJXhoCmlO 0LINlDrERzh8FUOKzsZWzUUUnGkKgevBTsd2U0Vhs/Q+G75LOZWYeGnYeQrFoHYJ2cBNfI1IOYO5 OTk7cLfJ7k0cFh/xf+vAu5IpwoSGObbHmA==