• unknown's avatar
    Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · 44a2e316
    unknown authored
    into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
    
    
    sql/sql_delete.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    BitKeeper/deleted/.del-rpl_variables.test:
      Manual merge.
    mysql-test/r/multi_update.result:
      Manual merge.
    mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
      Manual merge.
    sql/slave.cc:
      Manual merge.
    44a2e316
slave.cc 137 KB