# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110315132634-veyw8hfvavpwgwoe # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 64321937c1fa2f9fbc2f7f3b08990e332355e799 # timestamp: 2011-03-15 15:28:00 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110315105747-\ # rayxnmmy58d7d7jq # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfzx70AABB9flEAQUmP/91MC EAC////wBAAIAGAGX28YoaCBN22xU4YTCSVTwmp6m2iantU8mamoGmjygaGmQCSmQpsKjyNGgmJA AaNAaaBhoaAAADQAAAAAlNTTRNUNqGnqeoDQANDQNA9QYaGgAAA0AAAAAJJBMgJtGoCaJ4ptKbU8 UPUPUBhgkhsN5FJDHx2KnmMpTDbthnheAYMBtZMxLVR0t06VfRqb6unm1Xg1SkmJVJ11OPF9hiUI CTCTMxq0sw0VvpsW+HLNUvumIeVyzPIsqKEqSkgoppRROX7cqKmzKyhECiIrO0VJ1FZ6UURJULKK 2pV7O5GRgYGr9PF54GtDOg8pat2/APgzLNZ590D4OSzFIPKxwvkBTF88FxFYLmeBS9qfseAigcTD mKyrpqVBVEKTU4oE6+pnjBznc8TKwMGQmZIGGaFRgqyQt4oWPCQ4YYcHBMzFJGWebYjSLriw5Oud 3LPBMuEMmKE4ihN5E7ixSFawoNcyZgqIvtPAh+LrEySGXA3h5dDABOHjhTuPab1DGjtNxkWSAJOW owKQwfImFcUcfwZEc1rUSJzcbC4zwy+BaLm3tovO41mXjkMbt3AKjCkZECuLylWlflHOGNkndowj HbgEhuICcWRBYQUhqWhF3wCjFWEdHuFFSkZPLRQ0uS3HuMewiNSQX4YNloybEbNYlkHMJESDlOAB 2Z9nQUfHELFeMGImJMJ2MuEDEX2v43c2tzbBUfcZERXygE2DaMXMHFjwsz0YyiWFMWo4RwyCaaBJ yHzTyJna4Q8GB+JqUHqvIVZ1Zbk+WMMlUnqVERFkwBRG5aOenTzX9d0vI2w4m5Upm4tnVYTrk6Fw NZUKk6CaNriOROxsbtroM1VpFr2JzqK8FtYfDkJ2MSOZRGjibkZE9pgTjjsgztjId3mQgGUjvHGF mdxNo1Wi3QLivjSMdZEWZBUFqfkormIt2U19rvBnelxUFZYkt9U6rhnHTElItLUVIGFFiasjmrDm N6XUjLmLtuZYExaUfJXhViTXhDrxsLtwETK0LnR5PJQOViNAqTeZNsG/tW4l4Es3FhkUIDWFiFcP CQ4TEhohNKUxjIUPcNT8Gw3heOO90sTrNJeNjkgGuNpITCNcoGONrxXkzMJK2EYMKdh5qFs6UYIF Y/O4yO0QtHdAfXGoJxTUtA5IF57jcQLMhH0SQLmyIuEy7bevYTtg/TomTMSBZzqiZhD0kONMryyN FTLklmqfY1BkDjxNqQDBKLS4oKRWkE41EgDCzqFXPNvEa8zxgwwhZiFtMtPI1s0paMrkUjMWq6KJ IUv1JHDF4/8xYuqKJ0DT0EXlq9Dd9+sCAhYOcYU2bS01JiIntLudTx+3K89DuP3mrhmdQzS224Gf 5PHWj3ldnMYE1MCSpMMRz8CIN6QuWQQEwr9dxn9+h0PEJgbVWYrxRO4sBMKOjhN11r2kV3v6uc4x LxS7JQdu0WByNx6HWy8g2iipEX86BvcXgUPTlFiBiI06xTUpCxLEzygqMj8ExIYBRcLOIR09iXZ8 aB58jMkXA9YHd6xynJcc0oGtAvI2pbkhbfA7+AFwLjIAcqIUEVyPaTJnyEL5oFtS/B4kGRAYg28y RYcuG4obU9pkw36l3E8AGJjpOQORkl4pwsFhDQFAXXocIIFENnQW8EpAe5BfQhTS9bkd3iz1DnXc MMJ4QKiJVibhf6rhHlefPHgHcRigCXqZBYIwOpQLZt2sSE9Fr6ETzERikwvVO2ES/BmZWl3IBxIN jDY/RaEwJ+Qwx0DAvcXFodyRj0Kh6J1SsKQh2kLKLiuUx3CDmTSr49lpCaorC1gbLiZMLQWPAXT1 TmoCxFSSOsRVXhCxRH8Fp8H+LuSKcKEh+ePegA==