# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100602105045-30mdh49geqmogtsi # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 650ed8aa1928b18c8569baf5ebea4e61e3e7e598 # timestamp: 2010-06-02 13:50:51 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: jimmy.yang@oracle.com-20100602052631-\ # 2jc4lcg630xsj30v # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcmG2UMAAkJflAAQUm//91MC AoC///9wBAAIAFAEbTzlKrs0clGlCSiT1M1E8TSeU9pGp6ZBqaaaANABJSaDBDJoJQ0b1Q00GQBi AQ0qep+qeUeoZHqGg0ADQPUAAMBoAABoAAAAAAkiCJk9E00SeyAk9CfqJogDTamqmpgvPkcsbMsj 6lFXoZncrHNIMQwhPE57ckkeORztJMIQAAOMp92LWfQ+e1UxhAwK0Io+kt4gU28o/Erl1gW9GmDE p9UMrGP96IHpTxAiYKhZSMavnrhvb23Yl0/sKCFcqAMBaJLxTCrJcHj67mqZmdVADFeCcuBuLYTL tVJpGsb5uhXnIS5Chpj8kjT6VbgKgKEFYLI1RSLrysrjFOwyidTA7eVU7NtouAnEtVJisVSDxKEw OOYHY2JY3AUYvhbpQpu7K0O9VPDHcmfMU8TWnvpZExGCfq+mHQs04Qq3JDTXMLRlg892+6rIU9rI l7sM3uIxIsd97mC5G6hjSQHgthNuo7ZzFooiy2WIsyHVge0whhjuaTvW7C0ecdLRt8ALrSHM3vqZ AYEVuK5y/o8v0A6mbu0mBAnveZFHRb8RzwcvJCljC5NBLEkRNZvUATpS8VFPrDzMlFlordjInMKO oAyl4rs8hnF4mxosiLl8ximoLSocvJFjWz3tcYCthEWorJVlB1C69uL7ISE9PGEnizZJppZqQZIq SKTHgcl1LVnxRWEjkmDwQshISBVOU4MNUIg0KbjJrg4joPIr02mQQc0Id/I9SgsjqmEazUmYb+Hk Ip4jBdFmoyH5+/nANnz8RniK48CJuFcOZ2gpmR56+Z1pJxO8mWo4BfCo8tKdyxkl+R6S7dsxde42 lB+wmt5cdHSYsFw9VxcXc0ExI6DjCtE5Q/6nRcTlBhkk6uSWzZDan5+lcg7SD0LCMkV1euxj2E+W xapigVHIDorLNp6Wp0l+WKx+cuOJcTH3VNmWFA/gUD9ZwY2cyo3y/UstkoOL7tmll8dk+1jvhp4i XEHpgaQLYVndTsqnhqDOKRDcwG7WM54tL6rSMcVS+Ci/CiJixhvf8HsOc2LmZsVBbfNLQD2PUDvU w15tAfMWdHLkyO2ZcXlPyhpytXU4CREuaprW1E2ZS9IUOzTI3IvGmDFxUarqEwtBfZWi8SzXwwLM LUa3CDAvunLEkwe1u39q5qs7AHYFgf0d0w/AwXkBQjS9fItHWIFKipTXSdQnJEFgyHi7rlKQorPJ WKDJmD4dePUSkGFAGboC8Xc08klyh69Xa1VgesZzXdgwGq6LtYXuqB4MFYI6lsUp5QTTK7JiVauv lKPYqeYmX0IQoPeX3GbFpUBvQ5ooGjGr+2CoWGbMqgroO41DswpOGzPRBEgaK74gNCh3mkl0MBPw l7FYqiwIJ0TOKb0TubblL/wofc/Qu5IpwoSGTDbKGA==