diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-13 00:38:43 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-13 00:38:43 +0000 |
| commit | b37f86a3b8c0958755ba51707fb133de8e86285d (patch) | |
| tree | be54c71368aa5c6d019489a681d1a12029bfc0d0 | |
| parent | f8fe986ce3b65207cabba3d9cdaa20975baad204 (diff) | |
| download | mariadb-git-mysql-4.1.6.tar.gz | |
fix for some build/test errors for 4.1.6mysql-4.1.6
| -rw-r--r-- | mysql-test/include/have_ndb.inc | 6 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbScanFilter.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc index 7567a0ca362..84e60657876 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 9629c5e8904..bff7f9be0e6 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 3813ab139de..38b1c70c047 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 |