From 2d1f41a1968bd4830276f75beeafbe89eaa9a48e Mon Sep 17 00:00:00 2001
From: unknown <skozlov/ksm@mysql.com/virtop.localdomain>
Date: Wed, 21 Nov 2007 00:39:55 +0300
Subject: [PATCH] WL#3949, fix for 2nd part

mysql-test/mysql-test-run.pl:
  updated mtr
mysql-test/include/set_binlog_format_mixed.inc:
  set mixed binlog format
mysql-test/include/set_binlog_format_row.inc:
  set row binlog format
mysql-test/include/set_binlog_format_statement.inc:
  set statement binlog format
---
 mysql-test/include/set_binlog_format_mixed.inc     | 2 ++
 mysql-test/include/set_binlog_format_row.inc       | 2 ++
 mysql-test/include/set_binlog_format_statement.inc | 2 ++
 mysql-test/mysql-test-run.pl                       | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/include/set_binlog_format_mixed.inc
 create mode 100644 mysql-test/include/set_binlog_format_row.inc
 create mode 100644 mysql-test/include/set_binlog_format_statement.inc

diff --git a/mysql-test/include/set_binlog_format_mixed.inc b/mysql-test/include/set_binlog_format_mixed.inc
new file mode 100644
index 00000000000..836992d1080
--- /dev/null
+++ b/mysql-test/include/set_binlog_format_mixed.inc
@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=MIXED;
+SET SESSION BINLOG_FORMAT=MIXED;
diff --git a/mysql-test/include/set_binlog_format_row.inc b/mysql-test/include/set_binlog_format_row.inc
new file mode 100644
index 00000000000..49f34c8ccd1
--- /dev/null
+++ b/mysql-test/include/set_binlog_format_row.inc
@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=ROW;
+SET SESSION BINLOG_FORMAT=ROW;
diff --git a/mysql-test/include/set_binlog_format_statement.inc b/mysql-test/include/set_binlog_format_statement.inc
new file mode 100644
index 00000000000..ed286e7e3cc
--- /dev/null
+++ b/mysql-test/include/set_binlog_format_statement.inc
@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=STATEMENT;
+SET SESSION BINLOG_FORMAT=STATEMENT;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fd0b5cb98bb..bb520bdf617 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3343,7 +3343,7 @@ sub do_before_run_mysqltest($)
           mtr_add_arg($args, "--port=$server->{'port'}");
           mtr_add_arg($args, "--socket=$server->{'path_sock'}");   
 
-          mtr_run($exe_mysql, $args, "$glob_mysql_test_dir/include/set_binlog_format_".$tinfo->{"binlog_format"}.".inc", "", "", "", {});
+          mtr_run($exe_mysql, $args, "include/set_binlog_format_".$tinfo->{"binlog_format"}.".inc", "", "", "");
 
         }
       }