# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110531075529-3rtmo1f57435yppp # target_branch: file:///home/marko/innobase/dev/mysql2a/mysql-5.5/ # testament_sha1: 8996be3ea031a49c132f64a576d6f6305f379d8f # timestamp: 2011-05-31 11:27:57 +0300 # source_branch: file:///home/marko/innobase/dev/mysql2a/mysql-trunk/ # base_revision_id: davi.arnaut@oracle.com-20110530151722-\ # pi46y40nm27nrmv5 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWalKs8YAAo1flAAwWnf//3+n nwC/7//6BAAIAFAFbXlOjQ7budy60hVMEkimaU8gZR4TII9Rp6KaDI2oDJoNBkCSo0aamxT1JtRt QeoAAAGjQAA0ASmokyMo/UhtTymj1D1PSNNB6QANNAAAcZMmTEYmAEyYJkANGEYAhgEkgRo0Cam0 CGmkJ6nqPSeoepkBp5R6nqekH0cJzmd93A5zK0/rHPyRUGI0W7H8Tj68DwI5bOzyfpWoww7YM5ME QKOyxz8CLJdWGYxKonMQkhJqvBtCKV8zsz53xVMiJ8b3t590p0z7cDDfw5fhVCSVeUmM1jL7Ynj/ FriRA3kWRAg4PKTHjzbecJyh9BblageyLOowFMmdJ3Zlt/eVEPrJB26ER+Iuk80hgP4F5uFJIxik y/nor3rV+qcU3TuWRRITLnQXntp2DE+SQeBvYO7L3v1+nMhe0UpJiuscbhkisTPi4DMb3oZV63sW Gke4TtBSWCKOdL6e7iPQn3gb+k9rtVyF2kIsE0eY2Uvqz4u7TEUhPXdBuYQT3YH9gm2xVRYc+KEo FDRwnMZ79nIB9VJOv3rehWnOpSxK9ZDdEPcud05VIJizmjb2MM34iJUWmTF2V0lYwESL9cnDD3FQ GgtRTfqNwp5lZxNmwD5wuWjW9apYdUTcA85K9hS+vUtdMscSdInlAuMsLI5eKBCsiQ+SUC2GZIlg sQKmUaASFpltLLYFJoPms3VgQjUYOsnwdwj2kTZmzFhEwFC583Goo4zeFZMTi/QqUCJOj1iJwFoG 1ZbSsU8IkisvvC6haxcrUzrhT2Cg+sk59dhfElO15VWYkYLbPJm4FYGYmzoTeNNgv61+1TlG5P1E 0KWShU57UTp2nSh7RxxApFG11iSNqhYKZmPYrlvGnz5LAZ0g9xq6DbsSM4rCVXIKeX9o76ZDDMN4 rs9Sr0Xg4j5RLQiTs9DERV6L1KmsMqrHEQchgw8iCiSnkohlnI/RChQoVEH1R841NBrlo8rLw7RL gOvFBdEOgcmEpSrTFb0kISF353hHkMpJkNqQMaJXDcpaZbd7GwO/Zs2kDQ5zjejqQWdqKyuK4zZk 7GldKg4KRJwyaolTLm4C1GW3Xw+9ZnPj0C8Dv7q6s4AM4a8Wy44nEVYnCzE3+f6aWzbinAnqgLsw fEGKQw6ny69WwhSBMNCYTD9BGhwvf3GNdouNV08mUVxYWmO5X5vjzdBhEOc2xUUAppiHriwDd7C2 42O6k3C69GYniRRflkV4fNaS2pZ2afWaLLJ42i/bi4wQXNZ1xh1eFa0pgpKih2ndRAy3FpYhipD+ JHLqoAxmOOwfvA5SIm8UK4nJOUuTyMBxpmcdI9bdQttpoFUQYlRYpnmhb53q1tZen58PQhoQt5WW wxCxFR5qXnRRfuMqhaeOmyTQjQjPMGecEwxwgJuk5dKD13o5hHb/XIKIo5JWprRwJgsFhnaCqkqu tIwTcUHieSY16alebYYjGhYdAF1UVV0L0OB7IJjRz2OApGTDRMFPaYsMwYDAymRV0QYZF6UXB7Ny cDCuX1KUBkMwMr7xFIEk0Y60Sgi+LBrDrBMiYN0z1nek+jmYYIPUHXJyDV5gZVZEdduthJQVg4ZA d8BzIIV5VC/sjEQV6cpYsb0obQIRiYHm9+V+QKJTchi8qCv3As5kuXeFbK0UDExpv1L7IbQeQF4B mkRTtVwZMZEeagTwGAgWItW9ADRFFwNzXrHhLr6cJ8FnRXxFWlKmRdo8zEqw6F0gVsHV2IKoH8WZ P8XckU4UJCpSrPGA