database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge branch 'develop-1.1' into 1.1-merge-up-20180621

Browse Source
This commit is contained in:
Andrew Hutchings
2018-06-22 14:51:20 +01:00
parent 1caa98ff46 1ca68f63e2
commit 7ca289ded9
20 changed files with 1065 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
procmon/main.cpp
View File

@ -781,11 +781,11 @@ int main(int argc, char** argv)
if ( ret != 0 )
log.writeLog(__LINE__, "pthread_create failed, return code = " + oam.itoa(ret), LOG_TYPE_ERROR);
//mysql status monitor thread
if ( ( config.ServerInstallType() != oam::INSTALL_COMBINE_DM_UM_PM ) ||
(PMwithUM == "y") )
//mysqld status monitor thread
if ( config.moduleType() == "um" ||
( config.moduleType() == "pm" && config.ServerInstallType() == oam::INSTALL_COMBINE_DM_UM_PM ) ||
( config.moduleType() == "pm" && PMwithUM == "y") )
{
pthread_t mysqlThread;
ret = pthread_create (&mysqlThread, NULL, (void* (*)(void*)) &mysqlMonitorThread, NULL);
@ -1233,7 +1233,7 @@ static void mysqlMonitorThread(MonitorConfig config)
catch (...)
{}
sleep(10);
sleep(5);
}
}