Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bk/b24954-mysql-5.1-new-rpl


mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  Auto merged
mysql-test/t/rpl_000015.test:
  Auto merged
mysql-test/t/rpl_flushlog_loop.test:
  Auto merged
mysql-test/t/rpl_ndb_bank.test:
  Auto merged
mysql-test/t/rpl_rbr_to_sbr.test:
  Auto merged
mysql-test/t/rpl_replicate_do.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_row_until.test:
  Auto merged
mysql-test/t/rpl_slave_status.test:
  Auto merged
mysql-test/t/rpl_ssl1.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/rpl_mi.cc:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Manual merge
mysql-test/r/rpl_000015.result:
  Manual merge
mysql-test/r/rpl_deadlock_innodb.result:
  Manual merge
mysql-test/r/rpl_empty_master_crash.result:
  Manual merge
mysql-test/r/rpl_extraCol_innodb.result:
  Manual merge
mysql-test/r/rpl_extraCol_myisam.result:
  Manual merge
mysql-test/r/rpl_flushlog_loop.result:
  Manual merge
mysql-test/r/rpl_loaddata.result:
  Manual merge
mysql-test/r/rpl_log_pos.result:
  Manual merge
mysql-test/r/rpl_ndb_basic.result:
  Manual merge
mysql-test/r/rpl_ndb_extraCol.result:
  Manual merge
mysql-test/r/rpl_ndb_idempotent.result:
  Manual merge
mysql-test/r/rpl_ndb_log.result:
  Manual merge
mysql-test/r/rpl_rbr_to_sbr.result:
  Manual merge
mysql-test/r/rpl_redirect.result:
  Manual merge
mysql-test/r/rpl_replicate_do.result:
  Manual merge
mysql-test/r/rpl_rotate_logs.result:
  Manual merge
mysql-test/r/rpl_row_inexist_tbl.result:
  Manual merge
mysql-test/r/rpl_row_log.result:
  Manual merge
mysql-test/r/rpl_row_log_innodb.result:
  Manual merge
mysql-test/r/rpl_row_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_row_reset_slave.result:
  Manual merge
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Manual merge
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Manual merge
mysql-test/r/rpl_row_until.result:
  Manual merge
mysql-test/r/rpl_server_id1.result:
  Manual merge
mysql-test/r/rpl_server_id2.result:
  Manual merge
mysql-test/r/rpl_slave_status.result:
  Manual merge
mysql-test/r/rpl_ssl1.result:
  Manual merge
mysql-test/r/rpl_stm_log.result:
  Manual merge
mysql-test/r/rpl_stm_max_relay_size.result:
  Manual merge
mysql-test/r/rpl_stm_reset_slave.result:
  Manual merge
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/t/rpl_log_pos.test:
  Manual merge
mysql-test/t/rpl_ndb_basic.test:
  Manual merge
sql/log_event.cc:
  Manual merge
sql/rpl_mi.h:
  Manual merge
sql/rpl_rli.cc:
  Manual merge
sql/rpl_rli.h:
  Manual merge
sql/slave.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/slave.h:
  Manual merge

0 files changed, 0 insertions, 0 deletions