bzr push into mysql-5.1 branch (skozlov:2676) Bug#18817

[Serge Kozlov]

 2676 Serge Kozlov	2008-08-13
      Bug#18817, removing --binlog-format option from .opt files
removed:
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
modified:
  mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test

=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=row

=== removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=statement --log-slave-updates

=== removed file 'mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
---binlog-format=mixed

=== modified file 'mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test'
--- a/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test	2008-08-13 19:12:51 +0000
@@ -1,6 +1,6 @@
 # Same test as rpl_truncate_7ndb.test, but with mixed mode
 # This is marked with 'big_test' just because the rpl_truncate_7ndb test is
 # so slow...
-
+--source include/have_binlog_format_mixed.inc
 --source include/big_test.inc
 --source t/rpl_truncate_7ndb.test