diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result
deleted file mode 100644
index 14cb5fad915..00000000000
--- a/mysql-test/r/bdb_notembedded.result
+++ /dev/null
@@ -1,35 +0,0 @@
-set autocommit=1;
-reset master;
-create table bug16206 (a int);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
-f	n	Query	1	n	use `test`; create table bug16206 (a int)
-f	n	Query	1	n	use `test`; insert into bug16206 values(1)
-f	n	Query	1	n	use `test`; insert into bug16206 values(2)
-drop table bug16206;
-reset master;
-create table bug16206 (a int) engine=         bdb;
-insert into bug16206 values(0);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-insert into bug16206 values(3);
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
-f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb
-f	n	Query	1	n	use `test`; insert into bug16206 values(0)
-f	n	Query	1	n	use `test`; insert into bug16206 values(1)
-f	n	Query	1	n	use `test`; BEGIN
-f	n	Query	1	n	use `test`; insert into bug16206 values(2)
-f	n	Query	1	n	use `test`; COMMIT
-f	n	Query	1	n	use `test`; insert into bug16206 values(3)
-drop table bug16206;
-set autocommit=0;
-End of 5.0 tests
diff --git a/mysql-test/t/bdb_notembedded.test b/mysql-test/t/bdb_notembedded.test
deleted file mode 100644
index 24e64ebbfb2..00000000000
--- a/mysql-test/t/bdb_notembedded.test
+++ /dev/null
@@ -1,38 +0,0 @@
--- source include/not_embedded.inc
--- source include/have_bdb.inc
-
-#
-# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode
-#
-set autocommit=1;
-
-let $VERSION=`select version()`;
-
-reset master;
-create table bug16206 (a int);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
---replace_result $VERSION VERSION
---replace_column 1 f 2 n 5 n
-show binlog events;
-drop table bug16206;
-
-reset master;
-create table bug16206 (a int) engine=         bdb;
-insert into bug16206 values(0);
-insert into bug16206 values(1);
-start transaction;
-insert into bug16206 values(2);
-commit;
-insert into bug16206 values(3);
---replace_result $VERSION VERSION
---replace_column 1 f 2 n 5 n
-show binlog events;
-drop table bug16206;
-
-set autocommit=0;
-
-
---echo End of 5.0 tests
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index b7ff4df7012..31218df019b 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -923,7 +923,6 @@ printNodeStatus(OutputStream *output,
 		MgmtSrvr &mgmsrv,
 		enum ndb_mgm_node_type type) {
   NodeId nodeId = 0;
-  mgmsrv.updateStatus();
   while(mgmsrv.getNextNodeId(&nodeId, type)) {
     enum ndb_mgm_node_status status;
     Uint32 startPhase = 0, 
@@ -972,6 +971,7 @@ MgmApiSession::getStatus(Parser<MgmApiSession>::Context &,
   
   m_output->println("node status");
   m_output->println("nodes: %d", noOfNodes);
+  m_mgmsrv.updateStatus();
   printNodeStatus(m_output, m_mgmsrv, NDB_MGM_NODE_TYPE_NDB);
   printNodeStatus(m_output, m_mgmsrv, NDB_MGM_NODE_TYPE_MGM);
   printNodeStatus(m_output, m_mgmsrv, NDB_MGM_NODE_TYPE_API);
diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/ndb/src/ndbapi/ClusterMgr.cpp
index d3946dddfb7..a8fcb756cdf 100644
--- a/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/ndb/src/ndbapi/ClusterMgr.cpp
@@ -222,7 +222,10 @@ ClusterMgr::forceHB()
       theFacade.sendSignalUnCond(&signal, nodeId);
     }
 
-    NdbCondition_WaitTimeout(waitForHBCond, theFacade.theMutexPtr, 1000);
+    /* Wait for nodes to reply - if any heartbeats was sent */
+    if (!waitForHBFromNodes.isclear())
+      NdbCondition_WaitTimeout(waitForHBCond, theFacade.theMutexPtr, 1000);
+
     waitingForHB= false;
 #ifdef DEBUG_REG
     ndbout << "Still waiting for HB from " << waitForHBFromNodes.getText(buf) << endl;