merge

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged

1 files changed, 6 insertions, 2 deletions

diff --git a/ndb/test/src/NDBT_ResultRow.cpp b/ndb/test/src/NDBT_ResultRow.cpp
index 8e92a57d2e4..ab8d7b07ea1 100644
--- a/ndb/test/src/NDBT_ResultRow.cpp
+++ b/ndb/test/src/NDBT_ResultRow.cpp
@@ -116,8 +116,12 @@ BaseString NDBT_ResultRow::c_str() const {
 
 NdbOut & 
 operator << (NdbOut& ndbout, const NDBT_ResultRow & res) {
-  for(int i = 0; i<res.cols; i++)
-    ndbout << *(res.data[i]) << "\t";
+  if (res.cols != 0)
+  {
+    ndbout << *(res.data[0]);
+    for(int i = 1; i<res.cols; i++)
+      ndbout << res.ad << *(res.data[i]);
+  }
   return ndbout;
 }