# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20110120095049-4xvjivqcldghi77b # target_branch: file:///home/marko/innobase/dev/mysql2a/5.6-innodb/ # testament_sha1: 917a26adadc673866ecb97cd8409086701857739 # timestamp: 2011-01-20 11:50:56 +0200 # source_branch: file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ # base_revision_id: marko.makela@oracle.com-20110120094755-\ # 2nlplwul43pbywsy # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWoxKAAAAahflGgwcnf//1sC gAC////wBAAIAFADw8NAGQADQk0AUPU8AJ5II0aZDTQ/VBoNA1NKep6ahtQP1TQZNAAGjJkaAAHM AmmATIYAAmCYAAAcwCaYBMhgACYJgAAAkkE0AJhNNRphNNT1TaTE0bUaZB5QogsyIlkMDflr1/g+ K686rEdv2jNjEG3yTkAwNR9FKSsrFtw3RGZk7gXP8rh1IHjEr61vcpKjju8i4OUoc2IXOnFEVtUI lPKEELjl2BII1h02pmQgoyZ4AIYEJLDLa9KkhYvuI9ypXzQbqVrRxu2bY2euNlcEjSK1SNPhsyqr o3WRXiwc2fBCH9EwjhIyMBdnaLKupA1DJldtHQZ36LNXpc4iPpx/BhX2rEVtCLgUmhhiw/819SH9 T9LfRUeei5xVTKsv2a35zIO7cIoskQUc63Bp7m+qMdnDhDeDa6DMmsWGOqfWZBhJQdVZJwINYDgJ 5y0QapIUDuT3VmO4tJVqSglVApJGC3zOFVcoUinwIGdO5TbdgY2q1RlQiN46coU7pX9zxraSVTGN yLbV1uoWVDu+1RVqn2ERUvViJmwNl+BXSs1mrX0l+pJWNbYTCxTQmWCBqcmdOXyrjF8jKDiiTstj SoRi8i5NJolISnahbdPr8zO7I0t6Pfv4e/v2LvSJq2TH8XvirWHuLYWMHl5+cT3ZM4mniFOGK3HI 4JHtE02drki+0ONj4B7LVI8tuUTWpF/4nBZtJjy6B1Tdb3OMx/lqu+EztGLlxRSuu7EGW9dlUvXd rL5OY9RPSILzSL+JAYGa7jt0qjQvCSdBe/EkW9lepWRU1ItpPGlnQy4Kkp2LALYN2brFQbKve9kW vSpsxpNABb1DpOAqtFPQ1o0U58ajvYdFxyOQdpEFm2gciMp8KmvnZbfdiIwIQEZIWWfF7lxKF6de 3cxyIvVKKBO8FzMgvCdvETIPGsHG/QWZV19U2MrlM9PMD/VwCvhdXV/mmEqsWZV7E3xrDRb/YUuE Ral6ZSSPvuDQFqHJUhS9Jeu2kXBkhiVWTvUrotVVCz6KEeiRzSNQ9D9hnb8134QxO6mMYn5TERRi 9KuDgbbbmvJQdGEpIeyZdPHJkjapXX53bQVIu0+sjy+yRYFqqcomFlm1mX0TzjGxdKds9B4i/l26 jrqmHJL4bHqKKOk5P0ihUKd9ijCaKZ45J7mNQc3v+UfDKaazv5OLIA06pynMZItzU+wam3F8H/uR LyD8DjfdWbmD2ZVplRPvvKTGawLk5or4rkdo0TLCi5ehmpubBYcqE/UNBVCprv1ly8FMqIJMvoLn ujG+DleDlGwn/4n+3/i7kinChINRiUAA