diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc index 7567a0ca362ccbf0e1abc50ec59434e87dffdd31..84e606578762c1abcf1ed9d20a601a293318a0ed 100644 --- a/mysql-test/include/have_ndb.inc +++ b/mysql-test/include/have_ndb.inc @@ -2,6 +2,6 @@ disable_query_log; show variables like "have_ndbcluster"; enable_query_log; -connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); -connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1); -connection server1; +#connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); +#connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1); +#connection server1; diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index 9629c5e890496aff6113018d8320a91694af0c1f..bff7f9be0e6c18762f132e5145aa6e3ba07c1e59 100644 --- a/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/ndb/src/mgmsrv/ConfigInfo.cpp @@ -2373,7 +2373,7 @@ ConfigInfo::getAlias(const char * section) const { bool ConfigInfo::verify(const Properties * section, const char* fname, Uint64 value) const { - Uint64 min, max; min = max + 1; + Uint64 min, max; min = getInfoInt(section, fname, "Min"); max = getInfoInt(section, fname, "Max"); diff --git a/ndb/src/ndbapi/NdbScanFilter.cpp b/ndb/src/ndbapi/NdbScanFilter.cpp index 3813ab139deaed179e88ff86b925e744d0c435c2..38b1c70c04787daaa120f72d54ba4b8b78f3f483 100644 --- a/ndb/src/ndbapi/NdbScanFilter.cpp +++ b/ndb/src/ndbapi/NdbScanFilter.cpp @@ -779,7 +779,9 @@ main(void){ template class Vector<NdbScanFilterImpl::State>; #if __SUNPRO_CC != 0x560 +#ifndef _FORTEC_ template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint32); template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64); #endif +#endif