# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100520131632-qvwrzeun5jbhv24d # target_branch: file:///home/marko/innobase/dev/mysql/5.5-innodb/ # testament_sha1: 607c7ba22f39f2530ad0278ca6d0848352de89d6 # timestamp: 2010-05-20 16:16:54 +0300 # source_branch: file:///home/marko/innobase/dev/mysql/5.1-innodb/ # base_revision_id: marko.makela@oracle.com-20100520114306-\ # oz8mce7y8m7y6p1g # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWGMIg8AArtfgEAwW2///18n lgC////wUAWs2eYlRu6g3bQdOhwkkSbVM1PUyPTE9ITQNGIB6gGgAAkoRpNpoyEYpmqAeoD1MgHq ZGgGgJTUJooeSeRPSNNPU2k0aAaeoABoNAcwCYCZGAEYmJhMJghpiaYCSQmQCYmgAjIaBPTVHoCD QaempfcD8EY1Ry/ttv7IevbIeGxNPBTpk5nFc735W4JUGtkWyrKn4JoSSV+1cM1PjmnvGzPvNhKB CTC9/Ub7fKjAi85xfUYO1LcHyp7RWokyosFYslFmR+qaXSoGlYBFluY4kW/GuL+RfeUeKLzj+qba CQwvYUjAdZQOKbjLh8Zs3FvX2a7NnuUkBs9oJ2bG9I5g5Hq8TDlUayw3iTfdPDof4D9PWYJ0qMc4 lgSwQsShtJU7ugmxdlmlPAhDPIvmdf5LEAZcgDcaV4VcpHyRWREzBW4czDYOd2vMU+ZPSTAjikyB 5lPjnHxzaniVCVIeNNW/Ym8iPTYlqKYW0tR1DmkGpL1aMapMSbrdJmVb0FklPmMVKTyuiwCjDmLM v6sJQjRampceJefsLiMJARzGFI0StQrqqPkHcBsy1NTSRg8eD0rSCNX2YZvskbS8KjRjPB0B1j1C pgJgNmU2TYzk+SpLAYqegsJywkYVu21QahPg57IkP3D0OHkRxhKtw83QWiUAeZAce5szKVxPflH5 4bHiW07xLGosd5qSTyym1SSymgx5AatIVK4hq0kwXAbJOKkr8S+JAruDAeOS4G4/vnT6Aml9MaFk r1Wloim0HRMicyPjn5F0J9OsYcEpjqErzwcMzGZWWGMawxJHTov8n4ZjdUmE4uGGMCKVNxW2d1Iw N5nRdw269ZpydUdmrJhrahqscK0ygFzYVKJZICmeMwxntK0zZ0YSqoKphQvuc0M4mz8zW3Pi4i9z 741gBQPGYZn7zWzHt7EXnsfkmJCJJ6ZVYznsfgq9l+SaKn4BNQTHTS9YkltMhrh6kCFfRJtpp4kB tGNmynwOw4HcWgHPs7ADqKDLOTGCaKLAD6WPxWUyvTGBxoQQPuUgFlE71r7itLoFx5Hb6xHkSJ5p U+sR57geOG/+u623tQ5hq0c5kDGRL0M51Gi4gYpZkpjtKmSiYpXmlfzUdU/zfvh8mcAPTsACOVuO WJybIPdyc8Us5eVkggDVoLAgWpXlyf6pbVHvr+mo4ygkHV7afx3BA6w1J0uQqV8cSU6iVPI5TSzX RTESbuJQt1ccxAywi1daYLojZtnsOWU/DwBvfKbURdYUgMkUoJo4+5kVqW9wtZzNhs3EyGPgRSyq dexwmJVU7rw5W1MZ6I8EGeMgcQ2fk3ynRxMNwa4THz6y9nsXw0gYpQwLjJlvAmKNyszaEv4VRJSO a70W1/ux02wlZQMg7zWIgciB47QPTWaRMf8dYBqRmSCdeJzqD0TwBtxSAMh8aHpu/qv5C7iVATnl 0rQHDFbu8AzHK39HDuA8GNCnWPFlt648MFAuXlTOWLWW7g1upokw5uttoFbkorNonU6kOHMR0Oe9 RliNIDta0MVJdSzSoZNDCRQBjqfYwUZF2O3pBSC8JeamR4t/YB4Igarl7vgrMNC7+itpNJju4vOP HgGqdWonTi7fPON9Nd14F2FbdbA5CMsU1aOntqQbSThpJic6A95JgggqJmVlWAW1Skw5jWKcT1rA zmwiTDNmCzTBzlYoREOIh3XTqiix5Sk/TVUTSOJkJDyH4CQ2ctKwcE7GDGDjM8tKEVBkExFgyFg8 6mF0rW3YJapAMRFVedN6KgKLFVxqEUNZzAobHKuSCKCgyZGqE50ZLzrqjhUoFly9XT/i7kinChIM MYRB4A==