• unknown's avatar
    Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl · 179e31b4
    unknown authored
    into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
    
    
    mysql-test/include/have_multi_ndb.inc:
      Auto merged
    mysql-test/lib/mtr_cases.pl:
      Auto merged
    mysql-test/lib/mtr_report.pl:
      Auto merged
    mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
      Auto merged
    mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
      Auto merged
    mysql-test/suite/rpl_ndb/t/disabled.def:
      Auto merged
    sql/ha_ndbcluster_binlog.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event_old.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/rpl_rli.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/set_var.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_binlog.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_string.cc:
      Auto merged
    mysql-test/Makefile.am:
      SCCS merged
    mysql-test/mysql-test-run.pl:
      Manual merge.
    mysql-test/suite/binlog/t/disabled.def:
      Manual merge.
    mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
      Manual merge.
    mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
      Manual merge.
    sql/log_event.cc:
      Manual merge.
      ,
    179e31b4
set_var.h 38.9 KB