diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-05-04 10:16:03 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-05-04 10:16:03 +0200 |
| commit | 9fc05826ccb1acff12fbc5a8c145cba136d5595f (patch) | |
| tree | 2d552af21aa947086996c93f240e402bccfb5a21 | |
| parent | 4e4d5ea357817d376289ec18eee7912c42e5fb3a (diff) | |
| download | mariadb-git-9fc05826ccb1acff12fbc5a8c145cba136d5595f.tar.gz | |
logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
BUG#10287
mysql-test/r/ndb_restore.result:
BUG#10287
mysql-test/t/ndb_restore.test:
BUG#10287
ndb/test/src/NDBT_ResultRow.cpp:
BUG#10287
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rw-r--r-- | mysql-test/r/ndb_restore.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/ndb_restore.test | 6 | ||||
| -rw-r--r-- | ndb/test/src/NDBT_ResultRow.cpp | 8 |
4 files changed, 15 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 330d28daf52..1b33d659cfd 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -167,6 +167,7 @@ mysqldev@build.mysql2.com mysqldev@melody.local mysqldev@mysql.com mysqldev@o2k.irixworld.net +ndbdev@dl145b.mysql.com ndbdev@eel.hemma.oreland.se ndbdev@ndbmaster.mysql.com nick@mysql.com @@ -240,6 +241,7 @@ tonu@x153.internalnet tonu@x3.internalnet tsmith@build.mysql.com tulin@build.mysql.com +tulin@dl145b.mysql.com tulin@mysql.com ulli@morbus.(none) venu@hundin.mysql.fi diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/r/ndb_restore.result index 8e4449b1996..c78a4137468 100644 --- a/mysql-test/r/ndb_restore.result +++ b/mysql-test/r/ndb_restore.result @@ -247,3 +247,4 @@ count(*) 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 diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index ee47f7da6bc..0c3babd54e4 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -208,3 +208,9 @@ select count(*) 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 diff --git a/ndb/test/src/NDBT_ResultRow.cpp b/ndb/test/src/NDBT_ResultRow.cpp index f82963901b1..11554b4a9b3 100644 --- a/ndb/test/src/NDBT_ResultRow.cpp +++ b/ndb/test/src/NDBT_ResultRow.cpp @@ -116,8 +116,12 @@ BaseString NDBT_ResultRow::c_str() { 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; } |