mariadb/mysql-test/extra
unknown 44c41cc2e5 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl


mysql-test/extra/rpl_tests/rpl_log.test:
  Auto merged
mysql-test/r/rpl_ndb_log.result:
  Auto merged
mysql-test/r/rpl_row_log.result:
  Auto merged
mysql-test/r/rpl_row_log_innodb.result:
  Auto merged
mysql-test/r/rpl_stm_log.result:
  Auto merged
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/rpl_row_basic_11bugs.result:
  Manual merge.
mysql-test/t/rpl_row_basic_11bugs.test:
  Manual merge.
2007-03-20 09:35:56 +01:00
..
binlog_tests Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-20 09:35:56 +01:00
rpl_tests Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-03-20 09:35:56 +01:00