diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-26 20:57:10 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-03-26 20:57:10 +0200 |
| commit | cba5f9d95d21da4c1668005432f4b0592b6f8c00 (patch) | |
| tree | 3ae34e51401ea2b709ce82a35ccf731e1c38aef3 /storage/ndb/test/src | |
| parent | 0234a14e75c724bda90f286deb8476e734f6ee9a (diff) | |
| parent | d24dab182f8366e1e0ee74248ab38d6df26abcd3 (diff) | |
| download | mariadb-git-cba5f9d95d21da4c1668005432f4b0592b6f8c00.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/test/src/NDBT_Table.cpp:
manual merge
Diffstat (limited to 'storage/ndb/test/src')
| -rw-r--r-- | storage/ndb/test/src/NDBT_Table.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/test/src/NDBT_Table.cpp b/storage/ndb/test/src/NDBT_Table.cpp index f970aae972b..2e0e5939266 100644 --- a/storage/ndb/test/src/NDBT_Table.cpp +++ b/storage/ndb/test/src/NDBT_Table.cpp @@ -33,7 +33,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab) ndbout << "Length of frm data: " << tab.getFrmLength() << endl; ndbout << "Row Checksum: " << tab.getRowChecksumIndicator() << endl; ndbout << "Row GCI: " << tab.getRowGCIIndicator() << endl; - ndbout << "SingleUserMode: " << tab.getSingleUserMode() << endl; + ndbout << "SingleUserMode: " << (Uint32) tab.getSingleUserMode() << endl; //<< ((tab.getTupleKey() == TupleId) ? " tupleid" : "") <<endl; ndbout << "TableStatus: "; |