# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110413075948-kvytmc37ye1nt7d9 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 819dfce13763af1086db0bb8f94530065ac7e5ea # timestamp: 2011-04-13 11:00:09 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20110412132746-\ # ma35etb6imzp2tyl # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUAEUucAA2HflCAwe3f//3+3 XyC////0BAAIAGAG9c+oACg1Om0rVNACEkoTE0I9JoYjxDSbUAyNqAZGg0AAEkompmap6epppqfq QZADagAAGgAGgDjJk0MRiaMAjATCAMBNNGmRoBhpqZJlTekynp6oBpoAABoNA0AGgAOMmTQxGJow CMBMIAwE00aZGgGEkQTIBNBoJqp/pBqn5DRTJiep6RoDQeUHqGAIgThj2GUYyYTIq8cmGBAIhi+o hVkcCZyfafFnHByww8aYDRnns14TULCw4L0+qhVWeZCtEMMYLqsTQQpfTQ1D+yH0Zdz63DSFgrBB IQEgDO8AgqsyTehJqRcYLEOSZUzKKsJsDGCC0xLGRDyI0ejFJwlId5WMP9epp3b+ZqD/Tyfbx+nv Pz4xmxytCA9mP6LYVQ2Kj4dF9V8Gu+I+8TLTEA1mJg5LH0smwtShCf0vxytvJv+Nv9T4L8EdjyxZ uOkfUO3RAzI9gZKZIdVFwRms0wx3kj7fVA0TKsnd3CBM+CsUZfJi8XJC+YvcaCvmI7GIu2PlAD/r rj2srmHKnu2KQgZXnkgquq9B9+hqWTqR85CwvcQbGdvhCUI5cHmhegU3I/q0ihTI2Ch17RsAi9zu hlaVFDEwl0+QskqsjFiVHLPeznl7ZoUvs7+pthKqFU9MpxFchs9d74SA1XC5nmFyoed1hs45H4iy L47T7Hx8bamQwszW3dvjrwAqQLMssd3FC6GKpXLJxBrdMipN0aORgLoYyYbbVGviwzfIRw1tP0dy 0FdfrO9BTdt27ZK0LWVrDwcGeBAmtsaESoWjTE0mbeBxgUXEUKWtDGl115aGDre3BoKgwGBhEwuu JMZDmBMeRIwTlswJYzLShEdTLiRxFEtvyvsazq5cZGGWBXqsx9BiBwt7NdhiJ8oZgMdb92UhbC0j n47lV0Io+Qrg1JcLmyJC8zGUwkrbCUnMZzAoWyYGNb1wtsllp3akkshrtXgudQLRSkbbRqPpoizc BIw3M2doEzVt9zG6sBbQJ51FTSDbAZitRnrKTtlPPcXYLlfYNFiNcXkWtwExGHEycW9igjRzK+EC NCEMiX/OJMv5lkNu1lxTXthpqbsWrmmKaRU6wBqtNXora1otn3pB8l71yWe7cDYjG4h09BxSoVkW UpUqD5NFeMYZhuZHcaDkgD3hCHpHzSTMRFgf0P7hhyX5nreYR+cdhgMT+fuBwqDRPoGkvoy0mYRI lbVRmadkZztOfsHxgiB9JiGB4qA2MiICkgHEo5EZcNYUzrULgFyj9WwY0GTK6ft+A54MJbU18qvT 2QKmVpDIKEHV+mgZ+VgX24luMl9VkEd4CROrczChYusSHURqYs65elF19Nk1/kXWHwaQoYdw0rdE xmYaqIiGDRSJDFsTwbYG0Whcv0i8RQOBvFP+Phyh7AQ7IHEszUknzEt751ZMyA7qa56LbgkCEWmB YRcxipnUdTylgZ4pjxUwe30w7+Vx4B0b3H5eetGIJoiTgxkRfzAjpz4Eec7DsTPeZkIMaPcrBkMk yDDLXAgcxygU4BdjVNmQVeaXp8SWW9sMcoT3nOaHzEcIjmqyDlroqThxXDsyM+j93fRsbOpLic1s MEci4AMkMilTvYvqMTC22FIMldHRSGwKBVFD7G4YDEUKZrgPRehyfPclA8P7emeYPmVTiE1C/rxc 9cBmFHzJIt+1y0INZwlxjV+CJDXn5jEMlcQnT6/FcV1UDGRYkUDTDmcO2suKMm8vZHDmZIf4ohu8 qmt669GDoJgZhI7IP9yOqJiOAHgH19AXovcIsg5+owEmOAZA2sOfDBaxPmKSgiLABEM+NSk1t6Sl U6D1PuTG7tRdgKWktxxi4dx4mNli0S9qYZTUGmCqD0VGX8C1xrnHUi6AEyLgzQDZqgpHgUsKRPgA 4h2BlXj4XsgrxEk3HIN2Bgh4iXc16G9bnmiS8/mJYo9eanBY2Bfi+D3ql+J2XMOgzIPb3SGCqvP2 xJjZ9OMKenhCctlr80KEopBlTYBYlbCapfSaRB1vpK4+rBCZOYFOxBR133O4OlZcZT1yusXaCsKo m5U8WKY+Gd5aijMX9c5YCkZpDEp8ERJnkGjr4wtCixsRnUAMw78XFhXbmS0ArZmi4GmLdSIU/X0X Al8ckdEham2STmHJHUAMzaZJ+SXqAqoVSaI3VxCMMLWMClsHim5SFauAUQVncAzoLUfIvwun8Xcf +LuSKcKEggAilzg=