# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110526062948-hd04ybuz4qr6ijby # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # testament_sha1: 9ce5c63e320dbd09f78dfcf073cafd9d557c06b6 # timestamp: 2011-05-26 09:30:19 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # base_revision_id: dmitry.shulga@oracle.com-20110525164828-\ # h71zhjn7nj07jn7g # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbxEmaIAAZRflEAwUm///3fj TxC////wBAAIAFAD5e7lxbl1bpAYSiEE2gU9pR4kyIPFAPU00/SmajynlP1TQAympT2JpM0E09Q1 GmRpp6jQaA0aAAASSAmgUemhGk2k8ETymJoAABoNBzAmJoMJkyZMjCYJppkYmAIYBJKNFPRknqbT U02mTRGjIANAAB6nqNCgwUkqOvBeHy/ZC2Cmea51AFwtGETTPjN29NVKqpx3mTpH9tseWUhZLI3+ x1alm6W4fy6/fKc9HCyi+MbrX38YkiL0CMFTOPbH3Cfz3QEUBSYw7luuVm0bNKrW4D8Ah5qLTSyD RH84LPp0kUT6oSHUARBNG9BS4Wka5MIxpxlEwiC7EuEth3qUawcpk6LCHpXQrLkbHb90xHZoMjHi HwbqicHZX1P7GXJPXSeT9qbkXae2SVFzMSGFqRWZ7DAQt63QYNqS1RGxPS9Z0cJXUGG5cUHwCN7V koms4W+Fa01UjWuBgRg6Kcz7mMGTX1PfzwgKarJGUzJ84MAWCYoCLY1FDeNEAt184Z4RgyUyDLED MpIVFcRmL2GMswCwGeqO4xFlBe6IvEK5g3OUKi2V5QsBsXAvDIzlsBlknW+K+BHKhS/LOstUCgsm COElIhqn56UvxZW3Zwg0byx5Kb0zmiVBOpuNV+ar1GU68xkje1ujz98u2tNKIczfmKVFGfX4jvI4 nInehxMjmZDCLSNYWisL7ixpAtJg6JsNb2RgZvTpcZY2Hwzhurf0kBz+qZK5qaXxGSNRK/K4HjgA 75ooMEKLdgDXCjCrdO3GDkWHm7tmMx3ovdG802N5CchHO4awUrT6HRS3WdgREL7chQqEL0Q/WsZk WpRImJFVGmXQDVmroEcuGhNkqMckVJAn0Jb9kgUXPzXJpOj0HUleOsuz7PU1i6mAkVaguitoizV4 VORTpAFy8NbrZ7suNyvRePPQ1VPcgYQMTz4TKsn2p9szxTELil7EXQcnqbqyHCUMYlO6AyvkM9x8 urpbdzuNpY/Fbr2ZgZi3am5QcL8Zyt3Moq9YSMReubSZ0poFOFLOJsFYXo3HvhwQXwi0ZgrDM3XC EciqFUripcmaoC2gMaDXUEgSPApC6kMEvKsjFuLqqtqRwAz/Y7hnaMFQsheak2iyMRzSi87hMXcc ZyB0XGyzmUQ9hzEq2YGZVjlr162YCRXLQhTDdDQ0dPekVhYtzlknn6KFG5GZQJDVYwn6BSxORl1N rFBzJLXmkimN5PiigqTYP4vCClLfMOMTxybkiz3JmaDrTnazYphdvgUWqndvR0vOtWow1LSnO7x1 +QHPa6FoxvYhlpWcsawsCCzZUTgnduPWs9eyZhS9gu0icKKzBVdR6kSYYGbUJ2xjt2izUOlR1Fzf 4Ytf+LuSKcKEheIkzRA=