mirror of
https://github.com/MariaDB/server.git
synced 2025-10-22 19:52:58 +03:00
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1 configure.in: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/slave.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged support-files/mysql.spec.sh: Auto merged
This commit is contained in:
@@ -455,11 +455,13 @@ static int do_event_thread;
|
||||
static void*
|
||||
event_thread_run(void* m)
|
||||
{
|
||||
DBUG_ENTER("event_thread_run");
|
||||
|
||||
NdbMgmHandle handle= *(NdbMgmHandle*)m;
|
||||
|
||||
int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP, 0 };
|
||||
int fd = ndb_mgm_listen_event(handle, filter);
|
||||
if (fd > 0)
|
||||
if (fd != NDB_INVALID_SOCKET)
|
||||
{
|
||||
do_event_thread= 1;
|
||||
char *tmp= 0;
|
||||
@@ -468,15 +470,20 @@ event_thread_run(void* m)
|
||||
do {
|
||||
if (tmp == 0) NdbSleep_MilliSleep(10);
|
||||
if((tmp = in.gets(buf, 1024)))
|
||||
ndbout << tmp;
|
||||
{
|
||||
const char ping_token[]= "<PING>";
|
||||
if (memcmp(ping_token,tmp,sizeof(ping_token)-1))
|
||||
ndbout << tmp;
|
||||
}
|
||||
} while(do_event_thread);
|
||||
NDB_CLOSE_SOCKET(fd);
|
||||
}
|
||||
else
|
||||
{
|
||||
do_event_thread= -1;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
DBUG_RETURN(NULL);
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -516,9 +523,19 @@ CommandInterpreter::connect()
|
||||
do_event_thread == 0 ||
|
||||
do_event_thread == -1)
|
||||
{
|
||||
DBUG_PRINT("warning",("thread not started"));
|
||||
printf("Warning, event thread startup failed, degraded printouts as result\n");
|
||||
DBUG_PRINT("info",("Warning, event thread startup failed, "
|
||||
"degraded printouts as result, errno=%d",
|
||||
errno));
|
||||
printf("Warning, event thread startup failed, "
|
||||
"degraded printouts as result, errno=%d\n", errno);
|
||||
do_event_thread= 0;
|
||||
if (m_event_thread)
|
||||
{
|
||||
void *res;
|
||||
NdbThread_WaitFor(m_event_thread, &res);
|
||||
NdbThread_Destroy(&m_event_thread);
|
||||
}
|
||||
ndb_mgm_disconnect(m_mgmsrv2);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -548,6 +565,7 @@ CommandInterpreter::connect()
|
||||
bool
|
||||
CommandInterpreter::disconnect()
|
||||
{
|
||||
DBUG_ENTER("CommandInterpreter::disconnect");
|
||||
if (m_event_thread) {
|
||||
void *res;
|
||||
do_event_thread= 0;
|
||||
@@ -564,7 +582,7 @@ CommandInterpreter::disconnect()
|
||||
}
|
||||
m_connected= false;
|
||||
}
|
||||
return true;
|
||||
DBUG_RETURN(true);
|
||||
}
|
||||
|
||||
//*****************************************************************************
|
||||
|
Reference in New Issue
Block a user