Commit 32535514 authored by unknown's avatar unknown
Browse files

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/mikron/mysql-4.1
parents 3003e7d2 aa3e61d3

ndb/src/kernel/main.cpp

+7 −8
Original line number Diff line number Diff line
@@ -250,14 +250,13 @@ systemInfo(const Configuration & config, const LogLevel & logLevel){ 


}



static void

handler_register(int signum, sighandler_t handler, bool ignore)

{

  if (ignore) {

    if(signum != SIGCHLD)

      signal(signum, SIG_IGN);

  } else

    signal(signum, handler);

#define handler_register(signum, handler, ignore)\

{\

  if (ignore) {\

    if(signum != SIGCHLD)\

      signal(signum, SIG_IGN);\

  } else\

    signal(signum, handler);\

}



void

ndb/test/run-test/main.cpp

+0 −2
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ setup_hosts(atrt_config& config){ 
  return true;

}



template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;

template class Vector<SimpleCpcClient::Process>;

template class Vector<Vector<SimpleCpcClient::Process> >;

template class Vector<atrt_host>;

template class Vector<atrt_process>;

ndb/test/src/NDBT_Test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1138,4 +1138,3 @@ template class Vector<NDBT_Verifier*>; 
template class Vector<NDBT_Initializer*>;

template class Vector<NDBT_Finalizer*>;

template class Vector<const NdbDictionary::Table*>;
 
template class Vector<int>;

ndb/test/tools/cpcc.cpp

+0 −1
Original line number Diff line number Diff line
@@ -347,6 +347,5 @@ Operate::evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & pp){ 
  return true;

}



template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;

template class Vector<Expression*>;

template class Vector<SimpleCpcClient*>;