diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1f996a68a9b..d4c68184627 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -517,6 +517,7 @@ sub command_line_setup () {
     $opt_master_myport=   $ENV{'MTR_BUILD_THREAD'} * 40 + 8120;
     $opt_slave_myport=    $opt_master_myport + 16;
     $opt_ndbcluster_port= $opt_master_myport + 24;
+    $opt_ndbcluster_port_slave= $opt_master_myport + 32;
     $im_port=             $opt_master_myport + 10;
     $im_mysqld1_port=     $opt_master_myport + 12;
     $im_mysqld2_port=     $opt_master_myport + 14;
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 4557ff97147..eb111a99b93 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -298,6 +298,7 @@ TEST_MODE=""
 NDB_MGM_EXTRA_OPTS=
 NDB_MGMD_EXTRA_OPTS=
 NDBD_EXTRA_OPTS=
+MASTER_MYSQLDBINLOG=1
 SLAVE_MYSQLDBINLOG=1
 
 DO_STRESS=""
@@ -548,6 +549,7 @@ while test $# -gt 0; do
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-ndbcluster"
       EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-ndbcluster"
       ;;
+    --skip-master-binlog) MASTER_MYSQLDBINLOG=0 ;;
     --skip-slave-binlog) SLAVE_MYSQLDBINLOG=0 ;;
     --skip-*)
       EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1"
@@ -1356,9 +1358,13 @@ start_master()
   then
       CURR_MASTER_MYSQLD_TRACE="$EXTRA_MASTER_MYSQLD_TRACE$1"
   fi
+  if [ x$MASTER_MYSQLDBINLOG = x1 ]
+  then
+    EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1"
+  fi
   if [ -z "$DO_BENCH" -a -z "$DO_STRESS"  ]
   then
-    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
+    master_args="--no-defaults \
   	    --server-id=$id  \
           --basedir=$MY_BASEDIR \
           --port=$this_master_myport \
@@ -1384,7 +1390,7 @@ start_master()
            $EXTRA_MASTER_MYSQLD_OPT $EXTRA_MASTER_OPT \
            $NOT_FIRST_MASTER_EXTRA_OPTS $CURR_MASTER_MYSQLD_TRACE"
   else
-    master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin$1 \
+    master_args="--no-defaults \
           --server-id=$id --rpl-recovery-rank=1 \
           --basedir=$MY_BASEDIR --init-rpl-role=master \
           --port=$this_master_myport \
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 5edd5e18a8d..98dbb41c0a8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3172,7 +3172,7 @@ with --log-bin instead.");
   if (opt_binlog_format_id == BF_UNSPECIFIED)
   {
 #ifdef HAVE_NDB_BINLOG
-    if (have_ndbcluster == SHOW_OPTION_YES)
+    if (opt_bin_log && have_ndbcluster == SHOW_OPTION_YES)
       opt_binlog_format_id= BF_ROW;
     else
 #endif