1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix for some build/test errors for 4.1.6

Browse Source
This commit is contained in:
unknown 2004-10-13 00:38:43 +00:00
parent 63af3d3a2e
commit beb3fddcf7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/have_ndb.inc
View File

@ -2,6 +2,6 @@
disable_query_log; disable_query_log;
show variables like "have_ndbcluster"; show variables like "have_ndbcluster";
enable_query_log; enable_query_log;
connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); #connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1); #connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1);
connection server1; #connection server1;

2
ndb/src/mgmsrv/ConfigInfo.cpp
View File

@ -2373,7 +2373,7 @@ ConfigInfo::getAlias(const char * section) const {
bool bool
ConfigInfo::verify(const Properties * section, const char* fname, ConfigInfo::verify(const Properties * section, const char* fname,
Uint64 value) const { Uint64 value) const {
Uint64 min, max; min = max + 1; Uint64 min, max;
min = getInfoInt(section, fname, "Min"); min = getInfoInt(section, fname, "Min");
max = getInfoInt(section, fname, "Max"); max = getInfoInt(section, fname, "Max");

2
ndb/src/ndbapi/NdbScanFilter.cpp
View File

@ -779,7 +779,9 @@ main(void){
template class Vector<NdbScanFilterImpl::State>; template class Vector<NdbScanFilterImpl::State>;
#if __SUNPRO_CC != 0x560 #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, Uint32);
template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64); template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64);
#endif #endif
#endif