diff --git a/mysql-test/suite/ndb/r/ndb_multi.result b/mysql-test/suite/ndb/r/ndb_multi.result
index 98c4265b833..40483887919 100644
--- a/mysql-test/suite/ndb/r/ndb_multi.result
+++ b/mysql-test/suite/ndb/r/ndb_multi.result
@@ -1,4 +1,5 @@
 drop table if exists t1, t2, t3, t4;
+flush status;
 drop table if exists t1, t2, t3, t4;
 flush status;
 create table t1 (a int) engine=ndbcluster;
@@ -132,11 +133,11 @@ master_epoch, count))
 engine ndb;
 show tables like '%$%';
 Tables_in_test (%$%)
-t1$EX
+t1$ex
 use test;
 show tables like '%$%';
 Tables_in_test (%$%)
-t1$EX
+t1$ex
 drop table `test`.`t1$EX`;
 show tables like '%$%';
 Tables_in_test (%$%)
diff --git a/mysql-test/suite/ndb/t/ndb_multi.test b/mysql-test/suite/ndb/t/ndb_multi.test
index ce7e22b3b7f..e033ad1e479 100644
--- a/mysql-test/suite/ndb/t/ndb_multi.test
+++ b/mysql-test/suite/ndb/t/ndb_multi.test
@@ -4,11 +4,11 @@
 --disable_warnings
 connection server2;
 drop table if exists t1, t2, t3, t4;
+flush status;
 connection server1;
 drop table if exists t1, t2, t3, t4;
---enable_warnings
-
 flush status;
+--enable_warnings
 
 # Create test tables on server1
 create table t1 (a int) engine=ndbcluster;
@@ -139,9 +139,11 @@ create table `test`.`t1$EX`
 
 # check that table shows up ok on both servers
 # before bugfix table would not show up on server2
+--replace_regex /EX/ex/
 show tables like '%$%';
 connection server2;
 use test;
+--replace_regex /EX/ex/
 show tables like '%$%';
 
 # check cleanup
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 75e9937ecd6..48973f3e27e 100644
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -3716,6 +3716,7 @@ restart:
   /*
     Main NDB Injector loop
   */
+  if (ndb_binlog_running)
   {
     /*
       Always insert a GAP event as we cannot know what has happened