Commit de677cf8 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/usr/home/bar/mysql-4.1
parents f34ca306 2032737a

ndb/src/common/transporter/TransporterRegistry.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ TransporterRegistry::start_service(SocketServer& socket_server) 
      {

	ndbout_c("Unable to setup transporter service port: %d!\n"

		 "Please check if the port is already used,\n"

		 "(perhaps a mgmtsrvrserver is already running)",

		 "(perhaps a mgmt server is already running)",

		 m_service_port);

	delete t->m_service;

	return false;
@@ -1199,7 +1199,7 @@ TransporterRegistry::start_service(SocketServer& socket_server) 
      {

	ndbout_c("Unable to setup transporter service port: %d!\n"

		 "Please check if the port is already used,\n"

		 "(perhaps a mgmtsrvrserver is already running)",

		 "(perhaps a mgmt server is already running)",

		 m_service_port);

	delete m_transporter_service;

	return false;

ndb/src/mgmclient/CommandInterpreter.cpp

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const char* helpText = 
#endif

"START BACKUP                           Start backup\n"

"ABORT BACKUP <backup id>               Abort backup\n"

"SHUTDOWN                               Shutdown all processed in cluster and quit\n"

"SHUTDOWN                               Shutdown all processes in cluster and quit\n"

"CLUSTERLOG ON                          Enable Cluster logging\n"

"CLUSTERLOG OFF                         Disable Cluster logging\n"

"CLUSTERLOG FILTER <severity>           Toggle severity filter on/off\n"
@@ -78,8 +78,10 @@ static const char* helpTextShow = 
"---------------------------------------------------------------------------\n"

"SHOW prints NDB Cluster information\n\n"

"SHOW               Print information about cluster\n" 

#if 0

"SHOW CONFIG        Print configuration (in initial config file format)\n" 

"SHOW PARAMETERS    Print information about configuration parameters\n\n"

#endif

;



#ifdef HAVE_GLOBAL_REPLICATION

ndb/src/ndbapi/NdbDictionaryImpl.cpp

+1 −0
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ NdbDictionaryImpl::NdbDictionaryImpl(Ndb &ndb) 
    m_ndb(ndb)

{

  m_globalHash = 0;

  m_local_table_data_size= 0;

}



NdbDictionaryImpl::NdbDictionaryImpl(Ndb &ndb,