# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101103091912-tlsgb3c8yp1mx6m1 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 982e7f6a588310d4f0081617eedfa4a5b27caf38 # timestamp: 2010-11-03 11:41:33 +0200 # base_revision_id: sunny.bains@oracle.com-20101103014053-\ # rlghb3z1wfbc45al # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWX2CoicACjVflGA4enf//3/n 3sS////wBAAIAGAPn0e6Ndd262773DqqstKAATuvdze891oBuve8AJFBQNHrk8JIhTImnlT2qfqE 080o80p6YpkA9TQZGmh6nkgyAlJoAI0NCmqbSepo0fqjTTTIaDQAAANBwDCMJpiGAQDIAYRpkyYR gIaCU9SEE1Npomj1RqPFANP0poGg9QZAAaA9QIoqnkp7KbU2qfqntExEyemiZGQaGg00AAAAVJIC aATQ0npMTJpMJo0kGTQ0yAGj9U00dy4i+NjcP4m+Ul9yYMLFkpT/VfzqP3GQToGckbhkQUfwQCRF Icn7T8kcvhss6CA6IFyBBhDboGNePLltzccJQo0HH3qEMyzxQM5w/TYNsYbZWOQqhVwVPeN6jQRm U1DpWGI4i+QIkSauHBxPV10pnOvM492tIgCWIDtKuxN9C1Micto3028xgtB1IUex0oM8EXuKv7v2 8hXGD8xgpgaNPZTzvYorfGQdcBwgUGFhYUVRSBVVqHD1ggvqZFN3T0W6Oe1CJY1fJNaGAXziV1bU 8VpcXJJb2zKN01bXGFJum9o5MWRymUql6bE8D0+12VYe5zUeDePEUzXQ15CaLYzPkwx1DBJMzDEr NMdrGaT02DmLGRkqldmY+2eY8WG8344awpiSXWxkgvnQ1cl+FfTauuK3WP65I9mvZHdG38qXKbO9 r0wMDv1tY8Z1BdsoYFBsciBKMFryWZT8jac0WkMCEyTQmIdkWdpFwJCTajVQmOJEAQ0I73Z7zuX3 juqRK8Hc6oKaRytJGbk04n5NPk0+WvDyjMMqIMTobzhOesmZ5Yqqjhptt5dummM8oICdkyJ+bg+7 4zecVLTiqI6lylPFye3EtSr7Pf5u2tmNke+8EuHlIElbEEj1nzfLARlEHeJCc3wMwmTZx8HXCrBt yzEm62WC8Op5AzpFmkAevvu/n84R9wfMF8hie0HhOi9xfCW4F8QJ1PPOaa43PXGZk8ZZJ3vN5PYF a1rVatkQQqzEIQliYmYGwUMupR1KnGFl8MJqExGLJbsDMyEkGcXmvTx7qbAIXqaJYSrFUijBVAMZ fVrrXqeGS++0iL5IeYPC2dap0WOarPiaYZZPx9uf76QYr76MP5ZzcDBeVbY/NlvyrT9P1ce1hMNT dJJs1S9USouaNbDV5DS9tavYYJe0ZqcQfkn50nbaQ7h7mdiZZ619Xzf1TXVw5b5VBWVQQ9BazgmU 4Hoghw1Ql0YIBi9j3ndteTVvutIaSDddqcGvU0ZA6ExW6rc2dW2/blnnysmR7TMaenMcQgc6clCx 0inURICM1To7GpqL9hq4U4SFNHH/J2ypExy5KnUuOWr4CW/dbocCXBIGnBUnJUqDk1EFACRggpZ3 LLd/htbnKnt9hNV/0m+aV7NtUw3Eyw0fDWghjLv8Eie9DIVVHJEUYCje4y7x5emVdiXbY2eeM3ib tNxOl2V2WNTiXzWoAbax1WiI3aIpCqqrCr+EAReFQ7NhxNxskdCoXU4QWzxpdLNVbq1NoxmTRyio iJsPJkpl4D/VtnJpItVKLJzFrBfLlNuG7MrbkyjGpE1tfZc7b3noweISug4mTJFxtP9DJECia542 tsYyXQ0hGKRYB2DBKarCmREHEyg4UaJGpk1pdH5ONUeMSJOre2392LdqmFPSU6yZmxo7wWc+69k3 bnccFvVorGarx09qgWOwib7xodlVHMGHLIJp4bTFCTANjeTiJywyzMj6RR7nmQAOJ85nqDClxzpH AhQfwkx9rFioASsvpRAtS5o/O3Yx7GNnBzTjmGYXsTKOo1EDOaki5wl9rwKYXUuPnjQkQKFnrzpb nMoAGNyw+ZYHPXFLTWexRBJXsbAB4sGDA8zFOQ1OSn1AmCDnrYYNNx9tywpI2hBXQNTM6lIPABSw syo5SJuBGAKFXs1ACGbwcdB6j70IDhhnyQOzmWiXKnTI4IGow6GQiaGlTW1iV4FTYkNIWjlA1nVu zYSGMH1jV4ASV5Jw3vgBPGIkyK7trMunu6VuYH3R5ZpCZgWpxLS5s0vuXoWNyxIhlGWgzgmPJFyk JjZGRD35F+Ms4kehYqCZxHxTLRWOZAAMEiA5RAVERKHI5zx9BpA1KgBMePlaLiD96JunEVc+A55U e+QzMgpCxEqbm22ZG2GxrwDjU1m5lNjfe1ukh0kLs3221PbPrSooqUqnPT2RY+cqOdOVHNvi1yr3 sVfk6kcl5MUiwYSKQa1YcNDUSVKNFjwfBU5Adw85FfA544xAJRBFFhgeJFEGgNwfGdh3EHMZjIo7 vJCa2EAtFt/J5Z+bFpSxCRDCxAzJ4B9Xz9p1G06NxXzKc+BcL7HZSfthuA+QfwpglJqoL9GraanK +Ww+5TVtnUxYKtgf7LopZxEeOBbO4+TfvP82XjBoI+EmpgbRPCd7GH7rnhygPoYOUR6DEQUWISVW BgRORMkEcpXGGjb93EaxDCJKYDnhQEAuCV0YR6iBi1nlAD4T6EQLkSZ4zqfMfOQPLXexEoWJfIOP RI7OkULj0FpR7tgMxoquNtsoNmAYjQonkMhtOQ6SXMXYi4rBwkJWrAvU3uJUK3JtvVgsG4iUx0Rs zWUTrWGE/V4pcxs3IwKROt/NSJB74vcGJJY7tCiW6IABiwtiOe2I78Z2AqFLs63ve5VKnF4ujZs8 v9J5tjVlnNHqg9WDHau2uaXFhQYA4Q6xx72hWLl7znAgv9MkzJMEUpqzt/G4uutVqj7vw2XHQuxi FWSqd34Rd7gdnZhVvk9j21dOjb1+xe8wc72Xhkra2NfeTQGt4t7czdWK51w5f3sgXg4Nyt7lgtro Z0P+fpbhhKU5Nz0M3PhLRdOfFpitJOxdIjGDlIjNzXWdFipbkfjk0JjZV6b+vWxYO26WZSyPmm8s 79bvPVszbXes5tS5uVbbE3M9iTavb2xzZtEjhsdFsXaubnF7wft6MZO+SUKcG9dzNz5u27kmILT3 yqe/159ZPGc1F8xivUb5zFhYMTjGgap9JKC1G6PNSPIYuiISkFAej06wCRJ4xoeajR04FkRPDao0 cPFsNEjvRJEgcHCMkhF+Q4i0yvXkMpcNWLRGqZ0z9jKvud0zt5cczcY3D1F/IvOkgzIOc1SOliWZ szCWiTKDK4sYcJmMDnoTx0NvFhKiyrLehGN3LXtnP0db2a7NzHqaNz2vBq19ru6WfTs/kuPckM1O b9ntriTe3J6x8JKZYJL8XW0UzdJXl0eUeHezyZ3x+DJwN1+5eto6qm3W2M2cPFZoR+9V5goPAzTY kZPilwPXi15PTe9ZyeTy8PFi1sGStH4z3GjRT5TBi9QWb2DOxLKjevdxMI8lp90Wnmp9EUji+Fkf NX9FWWi326YFNb0J2pLykkyoojLynDswmr6Hk5FoVNYmpb+Epg9J9bSOOOsxGc+rrkSpOKkznW9J 6t5WLCXw1u12JFlmo6RixJTt23xC4vyiThh9pJc+skqNebUOGXynxbRvjoa03Yw1CeLeLSgubACO 6rl5gCvSQWvOoZagHa1hu8MO4o1hJv1hKt6ofs0q2hGPCQ2e/Is834UOAXLJI/Nsd7si95s4MJEU jUpGUma6nWzbpfY0U+KLpXRaFmTKC5adCU1wfLnvY8aRUIr5DJieIUOynOc6wMhBKQE9o7CddK2q OCFaPC2bmdq+fUzMkvV/YVxZVqaiZQ/hiZzMtLT0JuemtM5c12nlKXo7aiWJttbQmNcUvwkqC0li 0RSkYKixT4r5Ev92+YLr56I0jVvu+Pvl/2NUNqo0KibiKqJNMYuS0fTz/FUcuOAtekM7p6SFOiVS qiqax9rrso1qJswjtPrhA5SqukOPCFtJ/S6SB+8iL5Jc4XxlZemo3Pgi9oR9puef6SGD9CXxPf1p N55Kk8opZa3qUckfBZFJK9BrJxeC6S/sthDFW3h+GXa1FUrQWe6pZLiXNCylEXlRF6JL0dz6eMmD LFlWSylOh7T3NczYknGHUdT8mJNMuzTUI+M2xuL2PHVntlv0H1pVKpWyJpmSUUkoSadpIpUfhK9Z XPsLry6S0bq0JEOghj0TFvJZ7mE67Q53xZoS6+kVXWjlO2sfAL1xSGudVCqmfdhGx7n0SxNdbilT tm5IyXI5Rjhi3y6q5S6RvkZOF8diMWMmCM+sjHcUOskB5NXJsow5C4IcGYqCPLRTQzNQuHWTNOmU kxTzPGVCkiqgqYuyuGF2kiWFvcZNkCy49taQ5VDoDoUPvTegWuaE6jSJZqISEx5kklRyvhHBTetG dZDwaRMWfHEu7qdremqwd0hrnnIYyG35T/u0e/Mw6qaro8Sd8hbOkj4e3m71Oug6pTs2yH7Sclwt toWTAgXIeZcJjGOUKy9/gqOo/4u5IpwoSD7BUROA