Commit beb3fddc authored by unknown's avatar unknown
Browse files

fix for some build/test errors for 4.1.6

parent 63af3d3a

mysql-test/include/have_ndb.inc

+3 −3
Original line number Diff line number Diff line
@@ -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;

ndb/src/mgmsrv/ConfigInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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");

ndb/src/ndbapi/NdbScanFilter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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