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

@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=MIXED;
+SET SESSION BINLOG_FORMAT=MIXED;

mysql-test/include/set_binlog_format_row.inc

@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=ROW;
+SET SESSION BINLOG_FORMAT=ROW;

mysql-test/include/set_binlog_format_statement.inc

@@ -0,0 +1,2 @@
+SET GLOBAL BINLOG_FORMAT=STATEMENT;
+SET SESSION BINLOG_FORMAT=STATEMENT;

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", "", "", "");
 
         }
       }