• unknown's avatar
    Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines · fb96eebc
    unknown authored
    into  mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
    
    
    mysql-test/suite/rpl/r/rpl_dual_pos_advance.result:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/slave.h:
      Use local.
    mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
      Manual merge.
    sql/slave.cc:
      Manual merge.
    fb96eebc
slave.cc 137 KB