bk commit into 4.1 tree (tulin:1.2223) BUG#10287

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2223 05/05/04 10:16:03 tulin@stripped +4 -0
  logging_ok:
    Logging to logging@stripped accepted
  NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
    BUG#10287

  BitKeeper/etc/logging_ok
    1.380 05/05/04 10:16:02 tulin@stripped +1 -0
    Logging to logging@stripped accepted

  BitKeeper/etc/logging_ok
    1.379 05/05/04 10:15:20 ndbdev@stripped +1 -0
    Logging to logging@stripped accepted

  ndb/test/src/NDBT_ResultRow.cpp
    1.11 05/05/04 10:14:00 ndbdev@stripped +6 -2
    BUG#10287

  mysql-test/t/ndb_restore.test
    1.5 05/05/04 10:13:43 ndbdev@stripped +6 -0
    BUG#10287

  mysql-test/r/ndb_restore.result
    1.4 05/05/04 10:13:26 ndbdev@stripped +1 -0
    BUG#10287

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tulin
# Host:	dl145b.mysql.com
# Root:	/home/ndbdev/tomas/mysql-4.1

--- 1.378/BitKeeper/etc/logging_ok	Fri Apr 29 19:19:39 2005
+++ 1.380/BitKeeper/etc/logging_ok	Wed May  4 10:16:02 2005
@@ -167,6 +167,7 @@
 mysqldev@stripped
 mysqldev@stripped
 mysqldev@stripped
+ndbdev@stripped
 ndbdev@stripped
 ndbdev@stripped
 nick@stripped
@@ -240,6 +241,7 @@
 tonu@stripped
 tsmith@stripped
 tulin@stripped
+tulin@stripped
 tulin@stripped
 ulli@morbus.(none)
 venu@stripped

--- 1.10/ndb/test/src/NDBT_ResultRow.cpp	Mon Oct  4 17:48:01 2004
+++ 1.11/ndb/test/src/NDBT_ResultRow.cpp	Wed May  4 10:14:00 2005
@@ -116,8 +116,12 @@
 
 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;
 }
 

--- 1.3/mysql-test/r/ndb_restore.result	Tue Jan 25 10:03:23 2005
+++ 1.4/mysql-test/r/ndb_restore.result	Wed May  4 10:13:26 2005
@@ -247,3 +247,4 @@
 3
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
+520093696,1

--- 1.4/mysql-test/t/ndb_restore.test	Tue Apr 19 17:23:01 2005
+++ 1.5/mysql-test/t/ndb_restore.test	Wed May  4 10:13:43 2005
@@ -208,3 +208,9 @@
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
 --enable_warnings
+
+#
+# Test BUG#10287
+#
+
+--exec $NDB_TOOLS_DIR/ndb_select_all -d sys -D , SYSTAB_0 | grep 520093696