# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110531074214-198n0vptgbz8ynyq # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 07535a83399fd1a003c5fdb1e95bad0cd380093d # timestamp: 2011-05-31 10:42:20 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: davi.arnaut@oracle.com-20110530151722-\ # pi46y40nm27nrmv5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXktSXsAAoVflAAwWnf//3+n nwC/7//6BAAIAFAFWXu27sbabu7uclEyo4SSEjU8JppTbJkmBTwTKD1NpqaNGgNBkCSoyDTTQjSe kNBoAGgAaANNAASJI1MI0Ue1NqZTyj1N6UDQ0aGIMgAAcZMmTEYmAEyYJkANGEYAhgEkgIGpgibR MqeaKfqn6p6hpp6jQGJ5QPU9QfCBRDj6QEQ1sP2zG+ntlBhs70q4Pj0HzJ2cfP/JbVuNe/23KGgo Bz5OSJXs02cV3vMXtLzEbY2tvYstFkpXUPpfFUyIn3Hvbz+chsp17Tb188/dVdjkXlHMZRl9oPH+ LUJEDeRZECDg85MeWvlxCuUPmGxsQPZFfIvFOTmuZLS9rcpMN4iUODCSDLBbYGMzpGYWdgpkicXR R+dmLes36qhRu3qdRITLWg1HZVnGKZ4x4HBg78aeyGzPmXOQuYqqqlWPM2SKxM+DhEEMnEy+UEQz w8vlFLUKpaQNCMsorrrhCi0DDhuHEs+ZCtJJWCkKDpYbGPRqylyuAgDKPiFpSrHZRbUauMDqPHdT eBAwGAr16Xzuk5+atsQqGhEDiqqrx22kAqkc09wsZo6+jDN+Iio18dTG3OOtWZDgMpkojE9TPJEx 0rBZVlOGJtFuLDsG9cqAU+Ry6m7lbYXUaQHV3S+Nyfapo4lF6w2iyE8DVZdFBOZXtdDUUqRKQV1a w3pRUQLLidk4j7WtCqa+Yo6XujxSDRumPMBVPhCep4xZi4MHiyonaityIiqrA0TjaTFWyEg5YFVU D3YIyiATqRRsFC4Ulw4mqJo3FFjCaZ9LS/fAw/oD2xRYi4TmWChoWFMoEOSLBReXFwa+knddA2W3 yWbQ4z4MkqclAPI5qpFU3pF4la2cV1LeNLTftB7ox7jLrNmZIvisJFmQTff+I4zUjDMN5rp6k/Re 5xH9oloRK7PQwET9F6k5PPVWFRQJ0MGHoUqBXHWoB9xkPopaqWptL5oZpYn1KTjGGMrIzFIRWaio ZFxzazBve0b5NsY2Pr7JBOZc5G0uC4bBQOJvmyakHZ6pe+gFe5HH0QRwQV9qMJVFacL6dOljkQc1 Gk4ZN0kiZaKxc8GPt9Zj5D7tFoont42+QGmcQGcNWLtNOAqhYfechU2Cn/n+mmqDck4E9XgvDN8Q YfXl3bDQxNDDVHdAtCsLh0kMKvwKFzFZhVWGYWIkxrTP8dGo3RDnNaoQBMxJns3UwznfA1lnTKw6 UlRPe7l0FrZijTRfZsDjAV1/WmJm/bjedEG9tPGQfT57VwTBsOoydw6dkzVQtLEMTQ/sI07JhNWO LYG+LDUEBhR6Eykn8jaOMcbjYPWvABMLXYYhQLrEiK1K8xLrperG0p1G3ehrly3KyyEBQMJ5qTSi nPuLyu+OOq7WitFEYM8sTDFkBNkMvUg/vcjMR4dOwLkXOSVqa0cCYLBX9toLoVTVXckYJu1B5Hmm OrbmrzdDEY2lhdKClxX9HWZQTGyJM2CmaGOkuVeBnY2Fx0AQEJlhNXTBjRnSnAcNagGK5cqmKhg1 9gOGIiq2ZHcEpo744N8p4gmRYHh1vWLs9jDA96ailnhLA5gZJTerLqYkpq0gaA5qCGgr486yY88x GRYqFZTmelOURMDjwfR9yyas3IYoTCrmJY1kuXtCplYKBeX3b8fZDQHkBfcGaRFOyoGNoDjElroF l5AtRct6AGgKLglruXu4UUxWWrZcv5uW0imR3gamTmak8OdbQDgHtJwKH2oHQP4t7f8XckU4UJB5 LUl7