mariadb/mysql-test/suite/rpl
unknown a36faa7eda Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


client/client_priv.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_invoked_features.result:
  Manual merge.
mysql-test/suite/rpl/t/rpl_invoked_features.test:
  Manual merge.
sql/log.cc:
  Manual merge.
2008-01-31 17:46:50 +01:00
..
data BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER 2007-10-19 14:18:41 +02:00
include Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-11-28 19:49:29 +01:00
r Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 2008-01-31 17:46:50 +01:00
t Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 2008-01-31 17:46:50 +01:00
combinations WL#3949 Test should set binlog format dnamically 2007-11-23 13:29:31 +01:00
README copy from test-extra-5.1 to main tree 2007-02-06 13:35:54 +01:00

How to run.
===========

./mysql-test-run.pl --suite=rpl --mysqld=--binlog-format=mixed