# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101201080932-xj3t62isqq5lw47j # target_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # testament_sha1: 9c05a4a3667975e93a7907d79931554b8e23cf30 # timestamp: 2010-12-01 10:16:08 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # base_revision_id: kevin.lewis@oracle.com-20101201021302-\ # 311a56085wxess3x # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUAtWqQAA1RflGAwWnP/93tn ngC////wBAAIAFAGHux3CIhMlatg0olhKJBJsU9TanpmpkENNBtRkNHqDTTQ8k0BJJGgYmmkJhT0 2qeoaAA0AAAAap5U/UT0g9T1A0NAAANANAAADmjJiYAJiMCNMCDEYJkwCMEkkwSZJtNDIaJkMmKY k9GU2kADTajIPe7FmzYGVj9Poex8zA2FQadZjw25RbGLGSjPbTVAdUkQTFQu4aQYFAgRETXGa0Oy BIoWtFsNtswxw0cM1P0lr3za9dJ1k9g8sz6fF0cwbHlf1OQ0m+30cGKHaoPQ7YWYKcYQlBm5XZmi DjrBKsGAsCAGhPluacq53IxLAE6RC+jRLCoTfCJQcJ1VKoYbRnQRCMMbGEcwtghaUkJwI5+XTTcW Y3uc6Bi8UmQzUGnzGEkUI7BMCJJMvO6k8XCGTeTLaMLApfNARXhEXnJ40VEYcyciWBiKCv0F3C4C HlqIsL1OhQAviyQP5nEL9pSESLLKQIlAupMkFI112W3WVhqUBfV7MZis6jCFa9hdwQNl/Q0nlflM jtlAUNbkHR448KYHgEcIMbHpwobGG5AKSQPDHexsjoo10laFVd5EWGqpLWewSe9WcpiJC1CI67MU jVKDKxlVeuh5qFCm7CaFYEQeJjCLrxOOlHQR3iZQWediNA1bPrcFgX6aSgcStyPPAUSFkqQtFiDE GLOLHqkuUC4pV05M2Mj1SpkInvE5RccC5sC9NUSMub6Z4CdfjApxlj0tZ9hbFTpgaM6qWRatBXQq CbRFiXZT2GpDyyI2WInXmGDhrlaV1NXLqjoWiuzXbImN+GIqHJVSa0wKDCntatXmWbGZFBQsgKkx GE12BVCve4LKFwQshKVmdd+WjGGZAtLiLqY0kK9YtMeaiqYqxOv2Fr7St0eW6LywGdv8k7/erK1x IRQ1g4M5YTGiBnAylATHCYmNAKUpTGKT2DUfM2moNhWd1DNQRLjkfI5LwXikzCKIGyuCSIUVBVV1 wx/dj6vwCJtuO26zcQI8blLbI/yBw4o/kk9feUyGMYiN0LnXvRHwerZVpuAfCg4v3OFQy1+B0Kon JifxBDvMKPef5+ghfDFzsYxmgilK6YI979JG8YWWaR7kwRIRqfxHq4YrZOIt8nGFEpPqfa3Q3UcF 5HRIoiSTEIsfsZkBQitFO+i2q1i0cl61TfAWQmA9Kj8Sg2Gpgrcf0OEKYhZk6pKZTQ3YG2IGWZaK +ssF2vE7IoMcOj0F1WarahYBxrKh3Ebt/Xg8Eo5CwhiKnQOyO+3vOBtIKQzpEAN+UeEVxur0GxJ5 OOZ7l0lbrjho4jP9jgVCIO0hnEURstDDPNkFGhIbExBSsYkQGEVQnm6ejILmO3YXnPthQQICjhQd gt5UFq+5yK1vGXQMi13ViOe9aDeWJtoFuoreHtnMqGUFzEVF4rbHCGzHQyi2uMSMRPYFos7weu4W 5KykPtDWaCBMvA4B3eIqwLxdxZIzdqOAv2qVHSXXrGV4I+5mFglsEiGpVnWBYBYOBLiREJg8RRN5 1HhleW+QWB3RC0gCKHyPmM5DDhnczWjIoKhzGwxFA8PrprJRYZMJi9goJCej4Jh5kdEzjOCYRgeY hgHjCYWHecSxwIuKQoMeXXxBLARzLF9xCglFE3CzeWh6hG0l0tuGGE3yTwmeHquWPXSS4ir4gcxH XsRf1IAo1CqcIqO8tCZmgJE0U3D7CToiJBKIkwmxaGhAIiuEZFhIT57YEhsjG5wzESQDEjSwzGce K5EUxaA50AWgqhxuB0RnD7ygaDDzOhAGKy9LACs/ojuFLXimbOOo382bQuJU6yMRaxK2Amt3PFyW WoFpXisBZpC1RS7BHpUYVLWHWrp/BxlZ/i7kinChIIBatUg=