# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110606132401-hu7s4whv32n8pqqu # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 144a6f60da65d90ccfbf3618421ce79f97cbcabf # timestamp: 2011-06-06 16:24:10 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: georgi.kodinov@oracle.com-20110606102805-\ # map11494gy7dcow3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSkesN0AAlfflAAwenf/93tr xwC/7//wBAAIAFAErTzkKFmJK1oQkkk9Jpo1T8RlNpkk/Ip+kjyQ00HqPRHqfpCASUmnqamSe1T2 om1PUGg0DQGjQAGgANVP9UamgZGmg000GjQyGjQNAyA0aDmmJkyaMJgmJpgEwCGCMCMAkkCaGgmQ NAkwKPCnqHkgDQNAjd+5p6Ne/QOc7x7+OBF11ZQgjdXBphlEsQ7FWQvfrmgMdYUiYHENBgKgkgEi ToJzKKVZCa66EwMZUCEkiCTNF6qr5U3P9dIVz/mfn26dJ5Mgxy5JJdW4qq22DRFW00w/ACBhWhKL GFGa3huUCszC6IWAoNooha9gDar1T7D4Y7ozyEoMLuXJI5LM8eA4wpM5kEcmHMKjP2Z+oEkLoKpz A4aCYYTJGaRnN+0caydaIp7ZiERzYqjMKmBYKwTOK3VvjfAvZMjLHn00LXxkpqkKuzKmoYUIkn35 NPGIGqe4WEXQUa325xXdGW8WDC3bZXm2LOvc40QnTfjIzA0fgONxxHkt4ToLGCOB3Mzewi6QwFuY w62FlVbx7OAd8wGeT5uldqFYZWE7RTx/tW5AVZMn32vTN0JlTF5BSY6LaLG9eoFWLKLFvKnMwg5a SFmsCo4LeQFy7yicoIJEiRMkYaX3CqdS2Ak+20VJNLCE8SJULa4YeMZTxYWZqkNrIw1LAWOonYsc QzXWodoFplOmD5CvitwovNSi944vYunfLEiUKjtApsFaM3LtkWSE5YrA1uH3X+TS3n2aY214HBlr wu0inS2J71Gp4NU0lNE5NcL3+pZeegYlDEe83d56Xi2HemQayIFY4c52hEfDvQ1Ij5Q2hHkjcf8I m9UPejohxUNghsEeSJLBithd34xBvcK+1LgW57j4nBI/sR97voJTe8lHgp3oc/ckaN3FnFOOmFdm RLzgErS+4Xjmee3zeOvHDz0F6x1dWv0QMUFMqOLDxhbuYnugUEwthCXr7XW3VOZJPF8RLCxPp1DX Y7ZXbKVhIGciBjsPcXUoZCdUZGXULCByX3K5uHQ2FMxOEvQTDJUTDYrCsftLSatpGc7KQik2WtXR fbnztp0FRc4i6p+5snRxxSLG8yde1MFKzV1X2x6yJD0OeUG51i3u1D90jmbh44ZJ7l0Hla9v5PA7 SZxJDPPoPCiFBhPWa7F1rsN4m3EqwPzAvS4rCRbYmkinQ1ENJOy6zY8Tx56CuRilaJdmGqiGPqQ2 Xai7MzdIt38Iic5I+e1EwWo3KUj/NAtRa4A5qQk4LoYJqGFPRyCVSRsLEeh0pxNdJUj4nbbfZgZ4 dwDnBoffKAsmRtNQ6pNHF0hMERMwMpdOTAEtCSfyYXCMeYCUSI1Gu2BcpblIpZlTo3i3HFhumkRg krb7PICPwgAx1gXZqaQfWdsEp3XKSql5FQKC2QpKEBMuPsA++8lcHGwmhioPH9/EmTFwwvse9j/Q v9yL2pmHkxOvrtKukrUUCIpOCWaXxAyok/T+uwrF4UrAwUr7lrRoRX2gR0ii1UHetjqE//FHL/i7 kinChIFI9Ybo