# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andrei.elkin@oracle.com-20110329145601-asqy5hj1a1gzrlra # target_branch: file:///home/andrei/MySQL/BZR/2a-23May/MERGE/mysql-\ # trunk/ # testament_sha1: b86e84cf5752b866720ef050b3152b825fb30af1 # timestamp: 2011-03-29 17:56:19 +0300 # source_branch: file:///home/andrei/MySQL/BZR/2a-23May/FIXES\ # /bug11765758-rpl_corruption/ # base_revision_id: andrei.elkin@oracle.com-20110329135627-\ # 38g5qdq7ndx855b5 # # Begin bundle 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