mariadb/mysql-test/suite/rpl
unknown cebc10e3c0 Merge stella.local:/home2/mydev/mysql-5.1-ateam
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/suite/binlog/r/binlog_unsafe.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_unsafe.test:
  Manual merge
2008-03-26 10:56:03 +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 stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
t Merge stella.local:/home2/mydev/mysql-5.1-ateam 2008-03-26 10:56:03 +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