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

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

Browse Source 
into mysql.com:/usr/home/bar/mysql-4.1
This commit is contained in:
bar@mysql.com 2004-09-15 13:45:44 +05:00
commit 0f39138756
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ndb/src/common/transporter/TransporterRegistry.cpp
View File

@ -1174,7 +1174,7 @@ TransporterRegistry::start_service(SocketServer& socket_server)
{ {
ndbout_c("Unable to setup transporter service port: %d!\n" ndbout_c("Unable to setup transporter service port: %d!\n"
"Please check if the port is already used,\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); m_service_port);
delete t->m_service; delete t->m_service;
return false; return false;
@ -1199,7 +1199,7 @@ TransporterRegistry::start_service(SocketServer& socket_server)
{ {
ndbout_c("Unable to setup transporter service port: %d!\n" ndbout_c("Unable to setup transporter service port: %d!\n"
"Please check if the port is already used,\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); m_service_port);
delete m_transporter_service; delete m_transporter_service;
return false; return false;

4
ndb/src/mgmclient/CommandInterpreter.cpp
View File

@ -54,7 +54,7 @@ static const char* helpText =
#endif #endif
"START BACKUP Start backup\n" "START BACKUP Start backup\n"
"ABORT BACKUP <backup id> Abort 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 ON Enable Cluster logging\n"
"CLUSTERLOG OFF Disable Cluster logging\n" "CLUSTERLOG OFF Disable Cluster logging\n"
"CLUSTERLOG FILTER <severity> Toggle severity filter on/off\n" "CLUSTERLOG FILTER <severity> Toggle severity filter on/off\n"
@ -78,8 +78,10 @@ static const char* helpTextShow =
"---------------------------------------------------------------------------\n" "---------------------------------------------------------------------------\n"
"SHOW prints NDB Cluster information\n\n" "SHOW prints NDB Cluster information\n\n"
"SHOW Print information about cluster\n" "SHOW Print information about cluster\n"
#if 0
"SHOW CONFIG Print configuration (in initial config file format)\n" "SHOW CONFIG Print configuration (in initial config file format)\n"
"SHOW PARAMETERS Print information about configuration parameters\n\n" "SHOW PARAMETERS Print information about configuration parameters\n\n"
#endif
; ;
#ifdef HAVE_GLOBAL_REPLICATION #ifdef HAVE_GLOBAL_REPLICATION

1
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View File

@ -579,6 +579,7 @@ NdbDictionaryImpl::NdbDictionaryImpl(Ndb &ndb)
m_ndb(ndb) m_ndb(ndb)
{ {
m_globalHash = 0; m_globalHash = 0;
m_local_table_data_size= 0;
} }
NdbDictionaryImpl::NdbDictionaryImpl(Ndb &ndb, NdbDictionaryImpl::NdbDictionaryImpl(Ndb &ndb,