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 remote-tracking branch 'upstream/develop' into MCOL-520

Browse Source
This commit is contained in:
Patrick LeBlanc
2018-10-15 10:15:11 -05:00
parent f3ce845842 788139f3ad
commit ac9676b612
28 changed files with 2326 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/configMgt/autoConfigure.cpp
View File

@ -518,6 +518,9 @@ int main(int argc, char* argv[])
string Port = "3306";
string User = "";
string Password = "";
string TLSCA = "";
string TLSClientCert = "";
string TLSClientKey = "";
try
{
@ -544,6 +547,28 @@ int main(int argc, char* argv[])
catch (...)
{}
try
{
TLSCA = sysConfigOld->getConfig("CrossEngineSupport", "TLSCA");
TLSClientCert = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientCert");
TLSClientKey = sysConfigOld->getConfig("CrossEngineSupport", "TLSClientKey");
}
catch (...)
{
TLSCA = "";
TLSClientCert = "";
TLSClientKey = "";
}
try
{
sysConfigNew->setConfig("CrossEngineSupport", "TLSCA", TLSCA);
sysConfigNew->setConfig("CrossEngineSupport", "TLSClientCert", TLSClientCert);
sysConfigNew->setConfig("CrossEngineSupport", "TLSClientKey", TLSClientKey);
}
catch (...)
{}
//QueryStats and UserPriority
string QueryStats = "N";
string UserPriority = "N";
@ -2138,6 +2163,7 @@ int main(int argc, char* argv[])
string PrefetchThreshold;
string MaxOutstandingRequests;
string PmMaxMemorySmallSide;
string ThreadPoolSize;
try
{
@ -2145,6 +2171,7 @@ int main(int argc, char* argv[])
PrefetchThreshold = sysConfigOld->getConfig("PrimitiveServers", "PrefetchThreshold");
MaxOutstandingRequests = sysConfigOld->getConfig("JobList", "MaxOutstandingRequests");
PmMaxMemorySmallSide = sysConfigOld->getConfig("HashJoin", "PmMaxMemorySmallSide");
ThreadPoolSize = sysConfigOld->getConfig("JobList", "ThreadPoolSize");
}
catch (...)
{}
@ -2155,6 +2182,7 @@ int main(int argc, char* argv[])
sysConfigNew->setConfig("PrimitiveServers", "PrefetchThreshold", PrefetchThreshold);
sysConfigNew->setConfig("JobList", "MaxOutstandingRequests", MaxOutstandingRequests);
sysConfigNew->setConfig("HashJoin", "PmMaxMemorySmallSide", PmMaxMemorySmallSide);
sysConfigNew->setConfig("JobList", "ThreadPoolSize", ThreadPoolSize);
}
catch (...)
{}