• unknown's avatar
    Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 · 562aa3b1
    unknown authored
    into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
    
    
    mysql-test/r/mysqldump.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
      Auto merged
    mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
      Auto merged
    mysql-test/t/mysqldump.test:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/handler.cc:
      Manual merge.
    sql/sql_update.cc:
      Manual merge.
    562aa3b1
sql_delete.cc 31 KB