# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101021090228-vpwbpnqc2ao24hhg # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 160f6905b322c9a5adb376c7a7ff91d227d8b443 # timestamp: 2010-10-21 12:02:35 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: jimmy.yang@oracle.com-20101021084828-\ # nq6sdrs3jqfltao5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfuplIkAAaDflEAwWmf///ci kIC////wBAAIAFAD/rsK6zs6AAw1T1T2ijNRoBoDQ0APUDQGgekARqINEeo2ImgxAAAAAaAAyQam TVP0E9UB6gHqHqNAA0AABzTEwEaYEYRgAAACYRgJJCaT0NU9MRknlD0k2gKaep5Q8kNNGj1DAnAx LY12/Tnb6eh+OemRw3QxNoEJu4abNsKLIb57GYh04Dwalm6b5JTM9fXhEvzX5GTe3yTSdWtHAJ6H qDHnbShRCB0ro1RzuH5qWNmQxDlQqJBfd/DxGewuMPU/AI9jkal8t1PH7ULVhe2Tm9YblmkbelKC zy5nx7YC7bHeDmEPEZJnsI3CcvHjxjEL88XiqOA5hhzP+1lMPVcVaSZdkRHgwjysQctC+DOoUqXX UY1bV7lx/db/da8PKeF2JYysHtzD76cRHOYvQRYUyGotFkypFV0KkuaBq6E0EPwBgEvtlhCclzaZ gJFxv21Ds51nLRaxRCLZsQlBOUdqviTKbjJUxFdzcxSYaJ9jtSRX3+0iCQPtKefMJA3TE1RNBjzZ yOhCwYjOqUElAD1y9CxEmq0mpqrN001sbo7SRttVpCxlJBKuTZLgoBAJNF2yuDbVtKAsaECyfA0q EL6qxEVBuU2ziA+DI5kfebJOCsKQQKIgJCKRMu0aXTzYUE+RjV3sedtxx5TskusiAQZ1OMkuuBUu VLUNTLFvsLgjCEAaiYEDIUE5ImgGKFmXxDRdZ3EUvjr9bUifZa8PLil6br5x/RXiguuyaPvWk4Zc KlGfj6emK889Bdlqp1Bycebia2P9BWPes9JQByMsKwofJZZTxmMASGAFFCThqMUx2aydSFoELSoS KOXqp3UmKf0ntG5Sl39vTS4FV3HnZvIT6O/si87XVSDqXhe5B2Gzl77evlc2sM61O3xbo+rihcAL 7z4TLjwyp5+rMpUBgpIqDl23k9q3LfzlNhqffl3+Kzd5sW1DZHlEcmWiHdayCPKAvkLhzLF2jZs1 mHdehqMTlgsFA+Fv4g0raIVY/XnxpyDHrCzjC7fsWql49HBN89bkv6xCtBnx6ktobXA9hEq0hi+u 3SCZdClTs6UjwS9z6DZaXrmfM55OUID4LcUPorcFz4Ceycum5PbhGC7xUbEMyZUYa8RkqkDiFtX+ a4oT6g7IlZ9kipLuerXq+dILdXvZkw4uj8xS34mEtmArEHctSvHJOAJvcpqy1k0ETcT6nEo8ZbAG WEKvhHU8rq/1qlXVUmTWmjslg6EfRWfNMp5jGr6waRNvc3Feg0gpTk4hOXJWwaD16jnJ1eA9o4GF ROgmVJVhQplL1O320WElSmOjbnUqw+MRXgqBXKg2MqjZqnd6cb73Ffg/J/F3JFOFCQ+6mUiQ