• unknown's avatar
    Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags · cb9af6f8
    unknown authored
    into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
    
    
    mysql-test/suite/binlog/r/binlog_killed.result:
      Auto merged
    mysql-test/suite/binlog/t/binlog_killed.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
      Auto merged
    mysql-test/suite/rpl/t/rpl_temporary.test:
      manual merge
    sql/log.cc:
      manual merge
    cb9af6f8
rpl_temporary.test 5.96 KB